update apps to support new icon2ext.ini

When extract kolibri.img

Was: File man~
Now: File managers
Reviewed-on: KolibriOS/kolibrios#517
Reviewed-by: bad_Dr3dd0x <1702+bad_dr3dd0x@noreply.localhost>
Reviewed-by: Mikhail Frolov <mixa.frolov2003@gmail.com>
Co-authored-by: leency <lipatov.kiril@gmail.com>
Co-committed-by: leency <lipatov.kiril@gmail.com>

barscfg/barscfg.c

@@ -89,7 +89,7 @@ checkbox tbMenuButton = { MENU_BUTTON };
 checkbox dkFsize = { FSIZE };
 checkbox dkAshow = { ASHOW };
 
-int dkLocation;
+int dkLocation=0;
 checkbox tbRunApplButton;
 checkbox tbClnDeskButton;
 
@@ -174,6 +174,7 @@ void DrawWindowContent()
 	dword frame_y;
 	word win_center_x = Form.cwidth / 2 + 20;
 	incn y;
+	int i;
 
 	SetDisabledMode();
 
@@ -198,7 +199,8 @@ void DrawWindowContent()
 	//DOCKY
 	frame_y = calc(y.inc(20));
 	DefineButton(22, y.inc(18), PIMG_W-1, PIMG_H-1, 200 + BT_HIDE, 0);
-	DrawPanelsImage(y.n, dkLocation+1);
+	if (!dkLocation) i=2; else i=dkLocation;
+	DrawPanelsImage(y.n, i+1);
 	WriteTextWithBg(68, y.inc(7), 0xD0, sc.work_text, CHANGE_POS, sc.work);
 	dkFsize.draw(22, y.inc(35)); 
 	dkAshow.draw(win_center_x, y.n);

eolite/Eolite.c

@@ -1,4 +1,4 @@
-//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2025
+//Leency, Veliant, Punk_Joker, PavelYakov & KolibriOS Team 2008-2026
 //GNU GPL license.
 
 /*
@@ -10,9 +10,9 @@ TODO:
   http://board.kolibrios.org/viewtopic.php?f=23&t=4521&p=77334#p77334
 */
 
-#define ABOUT_TITLE "Eolite 5.33"
-#define TITLE_EOLITE "Eolite File Manager 5.33"
-#define TITLE_KFM "Kolibri File Manager 2.33";
+#define ABOUT_TITLE "Eolite 5.34"
+#define TITLE_EOLITE "Eolite File Manager 5.34"
+#define TITLE_KFM "Kolibri File Manager 2.34";
 
 #define MEMSIZE 1024 * 250
 #include "../lib/clipboard.h"
@@ -112,7 +112,7 @@ edit_box popin_text = {200,213,180,0xFFFFFF,0x94AECE,0xFFFFFF,0xFFFFFF,0x1000000
 
 PathShow_data FileShow = {0, 56,215, 8, 100, 1, 0, 0x0, 0xFFFfff, #file_name, #temp, 0};
 
-_ini icons_ini = { "/sys/File managers/icons.ini", NULL };
+_ini icons_ini = { "/sys/File managers/icon2ext.ini", NULL };
 
 #include "include\settings.h"
 #include "include\gui.h"

eolite/include/const.h

@@ -51,9 +51,9 @@ char *kfm_func = {
 #define T_DEVICES "Устройства"
 #define T_ACTIONS "Действия"
 char *actions[] = {
-	59, "Новый файл", "F9",
-	57, "Новая папка", "F7",
-	60, "Настройки", "F10",
+	59, "Новый файл",  " F9",
+	57, "Новая папка", " F7",
+	60, "Настройки",   "F10",
 	0,0,0
 };
 #define T_SYS  "Система "
@@ -65,6 +65,7 @@ char *actions[] = {
 #define T_NVME "NVMe disk "
 #define T_USB  "USB диск "
 #define T_RAM  "RAM диск "
+#define T_VD   "Виртуальный "
 #define T_UNC  "Неизвестно "
 
 #define WINDOW_TITLE_PROPERTIES "Свойства"
@@ -150,9 +151,9 @@ char *kfm_func = {
 #define T_DEVICES "Devices"
 #define T_ACTIONS "Actions"
 char *actions[] = {
-	59, "New file", "F9",
-	57, "New folder", "F7",
-	60, "Settings", "F10",
+	59, "New file",   " F9",
+	57, "New folder", " F7",
+	60, "Settings",   "F10",
 	0,0,0
 };
 #define T_SYS  "System "
@@ -164,6 +165,7 @@ char *actions[] = {
 #define T_NVME "NVMe disk "
 #define T_USB  "USB disk "
 #define T_RAM  "RAM disk "
+#define T_VD  "Virtual "
 #define T_UNC  "Unknown "
 
 #define WINDOW_TITLE_PROPERTIES "Properties"
@@ -257,10 +259,11 @@ char *devinfo = {
 	"nv", 4, T_NVME,
 	"tm", 5, T_RAM,
 	"us", 6, T_USB,
+	"vd", 7, T_VD,
 	0
 };
 
-#define DEV_H 17
+#define DEV_H 18
 #define DDW 110
 #define KFM2_DEVH 20
 #define SELECTY 10

eolite/include/gui.h

@@ -127,25 +127,27 @@ void Tip(int y, dword caption, id, arrow)
 void ActionsDraw(int actions_y)
 {
 	int i;
-	Tip(actions_y-18, T_ACTIONS, 77, "");
+	Tip(actions_y, T_ACTIONS, 77, "");
+	actions_y += 18;
 	for (i=0; actions[i*3]!=0; i++, actions_y+=DEV_H)
 	{
-		DrawBar(SB_BLOCKX,actions_y,SB_BLOCKW,DEV_H,0xFFFFFF); //схыюх
-		DefineButton(SB_BLOCKX,actions_y,SB_BLOCKW-1,DEV_H,actions[i*3]+BT_HIDE,0xE4DFE1);
-		WriteText(45,actions_y+4,0x80,0,actions[i*3+1]);
-		WriteText(-strlen(actions[i*3+2])*6+SIDEBAR_W-SBPAD-7,actions_y+4,0x80,0x999999,actions[i*3+2]);
+		DrawBar(SB_BLOCKX,actions_y,SB_BLOCKW,DEV_H,0xFFFFFF);
+		DefineButton(SB_BLOCKX,actions_y,SB_BLOCKW-1,DEV_H,actions[i*3]+BT_HIDE,NULL);
+		WriteText(45,actions_y+5,0x80,0,actions[i*3+1]);
+		WriteText(SIDEBAR_W-SBPAD-7-18,actions_y+5,0x80,0x999999,actions[i*3+2]);
 		PutImage(23,actions_y+2, 14,13, i*14*13*3+#factions);
 	}
 }
 
-void DrawLeftPanelBg(int actions_y)
+void DrawLeftPanelBg(int devices_h)
 {
-	int start_y = actions_y+159;
+	#define ACTIONS_H DEV_H*3 + 18
+	int start_y = ACTIONS_H + devices_h + 90;
 	int area_h;
 	DrawBar(2,41,SIDEBAR_W-2,SBPAD,waves_pal[0]);    //above devices block
-	DrawBar(SB_BLOCKX,actions_y+75,SB_BLOCKW,SBPAD,EDX);  //below devices block
-	DrawBar(2,56,SBPAD,actions_y+103,EDX);   //on the left
-	DrawBar(SIDEBAR_W-SBPAD,56,SBPAD,actions_y+103,EDX); //on the right
+	DrawBar(SB_BLOCKX,devices_h+75,SB_BLOCKW,SBPAD,EDX);  //below devices block
+	DrawBar(2,56,SBPAD,devices_h+ACTIONS_H+34,EDX);   //on the left
+	DrawBar(SIDEBAR_W-SBPAD,56,SBPAD,devices_h+ACTIONS_H+34,EDX); //on the right
 	area_h = Form.cheight-start_y-2 - status_bar_h;
 	if (area_h < 268){
 		PutPaletteImage(#blue_hl, 190, area_h, 2, start_y, 8, #waves_pal);
@@ -153,8 +155,8 @@ void DrawLeftPanelBg(int actions_y)
 		DrawBar(2,start_y,SIDEBAR_W-2, area_h-268, waves_pal[0]);
 		PutPaletteImage(#blue_hl, 190, 268, 2, Form.cheight-270-status_bar_h, 8, #waves_pal);
 	}
-	PutShadow(SB_BLOCKX,actions_y+75,SB_BLOCKW,1,1,3);
-	PutShadow(SB_BLOCKX+1,actions_y+75+1,SB_BLOCKW-2,1,1,1);
+	PutShadow(SB_BLOCKX,devices_h+75,SB_BLOCKW,1,1,3);
+	PutShadow(SB_BLOCKX+1,devices_h+75+1,SB_BLOCKW-2,1,1,1);
 	PutShadow(SB_BLOCKX,start_y,SB_BLOCKW,1,1,3);
 	PutShadow(SB_BLOCKX+1,start_y+1,SB_BLOCKW-2,1,1,1);
 }

eolite/include/icons.h

@@ -3,13 +3,71 @@ struct ICONS_INI {
 	collection exts;
 	collection_int i18;
 	collection_int i32;
+	byte loaded;
 	int get();
+	void load();
+	void put();
 } ini_icons;
 
+// Stores the icon number for a single extension, keeping the exts/i18/i32
+// collections aligned by position regardless of the order keys are read in.
+void ICONS_INI::put(dword _ext, int size, icon_n)
+{
+	int ext_pos = exts.get_pos_by_name(_ext);
+	if (ext_pos == -1) {
+		exts.add(_ext);
+		ext_pos = exts.count - 1;
+	}
+	if (size == 18) i18.set(ext_pos, icon_n);
+	else i32.set(ext_pos, icon_n);
+}
+
+// Callback for ini_enum_keys: key_name is the icon number, key_value is a
+// comma-separated list of extensions sharing that icon, e.g.
+//   3=doc,docx,exc,inf,log,ob07,odt,rtf,txt,wtx
+byte icons_ini_enum_key(dword key_value, key_name, sec_name, f_name)
+{
+	char ext[7];
+	int  icon_n, size, i;
+	dword src;
+
+	icon_n = atoi(key_name);
+	if (streq(sec_name, "icons18")) size = 18; else size = 32;
+
+	src = key_value;
+	while (ESBYTE[src]) {
+		i = 0;
+		while (ESBYTE[src]) && (ESBYTE[src] != ',') {
+			if (ESBYTE[src] != ' ') && (i < 6) {
+				ext[i] = ESBYTE[src];
+				i++;
+			}
+			src++;
+		}
+		ext[i] = '\0';
+		if (i) {
+			strlwr(#ext);
+			ini_icons.put(#ext, size, icon_n);
+		}
+		if (ESBYTE[src] == ',') src++;
+	}
+	return true;
+}
+
+// Reads the whole icon map once into the collections.
+void ICONS_INI::load()
+{
+	if (loaded) return;
+	loaded = true;
+	ini_enum_keys stdcall (icons_ini.path, "icons18", #icons_ini_enum_key);
+	ini_enum_keys stdcall (icons_ini.path, "icons32", #icons_ini_enum_key);
+}
+
 int ICONS_INI::get(dword _file_path, _ext, int size)
 {
 	char file_4bytes[4], ext[7];
 	int  ext_pos;
+	load();
 	if (!_ext) {
 		ReadFile(0,4,#file_4bytes,_file_path);
 		IF(DSDWORD[#file_4bytes]=='KCPK')
@@ -22,16 +80,10 @@ int ICONS_INI::get(dword _file_path, _ext, int size)
 	ext_pos = exts.get_pos_by_name(#ext);
 	if (ext_pos != -1) {
 		if (size == 18) return i18.get(ext_pos);
-		else if (size == 32) return i32.get(ext_pos);
-	} else {
-		exts.add(#ext);
-			icons_ini.section = "icons18";
-			i18.set(exts.count-1, icons_ini.GetInt(#ext, 2));
-
-			icons_ini.section = "icons32";
-			i32.set(exts.count-1, icons_ini.GetInt(#ext, 95));
-		return get(#ext, size);
+		if (size == 32) return i32.get(ext_pos);
 	}
+	if (size == 18) return 2;
+	return 95;
 }
 
 void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color)
@@ -49,7 +101,7 @@ void DrawIconByExtension(dword file_path, extension, xx, yy, fairing_color)
 			icons_ini.section = "drives32";
 			icon_n = icons_ini.GetInt(#ext, 50);
 		} else {
-			icons_ini.section = "drives16";
+			icons_ini.section = "drives18";
 			icon_n = icons_ini.GetInt(#ext, 50);
 		}
 	} else {

eolite/include/left_panel.h

@@ -81,11 +81,15 @@ void GetDiskIconAndName(dword dev_name, icon, disc_name)
 	strcpy(disc_name, T_UNC);
 }
 
+#define DISK_COUNT 8
 void _SystemDiscs::Draw()
 {    
 	char dev_name[15], disc_name[100], i, dev_icon;
 	bool is_active=0;
-	int draw_y, draw_x;
+	#define DRAW_Y 74
+	#define DRAW_X 17
+	#define DRAW_PAD 2
+	int draw_y = DRAW_Y+DRAW_PAD;
 	
 	if (efm) { 
 		DrawSelect(2, KFM_DEV_DROPDOWN_1, location[0]);
@@ -93,36 +97,36 @@ void _SystemDiscs::Draw()
 		files.y = 40 + 17;
 	} else { 
 		Tip(56, T_DEVICES, 55, "=");
+		DrawBar(DRAW_X,DRAW_Y,SB_BLOCKW,DRAW_PAD,0xFFFFFF);
 		for (i=0; i<30; i++) DeleteButton(100+i);
 
-		draw_y = 74; 
-		draw_x = 17; 
 		for (i=0;i<list.count;i++) {
 			strcpy(#dev_name, list.get(i));
 			GetDiskIconAndName(#dev_name, #dev_icon, #disc_name);
 			if (strstr(path, #dev_name)==path) is_active=true; else is_active=false;
 
-			DrawBar(draw_x,draw_y,6,DEV_H+1,0xFFFFFF);
-			DrawBar(draw_x+6+18,draw_y,160-6-18,DEV_H+1,0xFFFFFF);
-			DefineHiddenButton(draw_x,draw_y,159,16,100+i);
+			DrawBar(DRAW_X,draw_y,6,DEV_H+1,0xFFFFFF);
+			DrawBar(DRAW_X+6+18,draw_y,160-6-18,DEV_H+1,0xFFFFFF);
+			DefineHiddenButton(DRAW_X,draw_y,159,17,100+i);
 			if (show_dev_name.checked)
 			{
 				strcat(#disc_name, #dev_name);
-				if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#disc_name);
-				WriteText(draw_x+29,draw_y+5,0x80,0,#disc_name);
+				if (is_active) WriteText(DRAW_X+30,draw_y+5,0x80,0x555555,#disc_name);
+				WriteText(DRAW_X+29,draw_y+5,0x80,0,#disc_name);
 				//if (is_active) kfont.bold = true;
-				//kfont.WriteIntoWindow(draw_x + 29, draw_y+2, 0xFFFfff, 0x000000, kfont.size.pt, #disc_name);
+				//kfont.WriteIntoWindow(DRAW_X + 29, draw_y+2, 0xFFFfff, 0x000000, kfont.size.pt, #disc_name);
 				//kfont.bold = false;
 			} else {
-				if (is_active) WriteText(draw_x+30,draw_y+5,0x80,0x555555,#dev_name);
-				WriteText(draw_x+29,draw_y+5,0x80,0,#dev_name);
+				if (is_active) WriteText(DRAW_X+30,draw_y+5,0x80,0x555555,#dev_name);
+				WriteText(DRAW_X+29,draw_y+5,0x80,0,#dev_name);
 			}
-			PutImage(draw_x+6,draw_y, 18,17, is_active*7+dev_icon*17*18*3+#devices);
+			PutImage(DRAW_X+6,draw_y, 18,17, is_active*DISK_COUNT+dev_icon*17*18*3+#devices);
+			DrawBar(DRAW_X+6, draw_y+DEV_H-1, 18, 1, 0xFFffFF);
 			draw_y += DEV_H;			
 		}
-		DrawBar(draw_x+6, draw_y, 18, 1, 0xFFFfff);
-		ActionsDraw(list.count*DEV_H+108);
-		DrawLeftPanelBg(list.count*DEV_H);
+		DrawBar(DRAW_X, draw_y, SB_BLOCKW, DRAW_PAD, 0xFFFFFF);
+		ActionsDraw(draw_y+17);
+		DrawLeftPanelBg(draw_y - DRAW_Y + 1);
 	}
 }
 

eolite/search.c

@@ -89,7 +89,7 @@ void RESULTS::drop()
 
 void SearchThread()
 {  
-	int prev_first, prev_cur_y, clicked_item;
+	int prev_first, prev_cur_y, clicked_item;
 
 	load_dll(Proc_lib, #OpenDialog_init,0);
 	OpenDialog_init stdcall (#open_folder_dialog);
@@ -112,17 +112,17 @@ void SearchThread()
 				SelectList_Draw();
 			} else {
 				SelectList_DrawLine(select_list.cur_y);
-
-				clicked_item = mouse.y - select_list.y / select_list.item_h + select_list.first;
+
+				clicked_item = mouse.y - select_list.y / select_list.item_h + select_list.first;
 				
 				if (select_list.MouseOver(mouse.x, mouse.y)) 
 				{
 						if (mouse.key&MOUSE_LEFT) && (mouse.up) {
-							if ((prev_cur_y == select_list.cur_y) && (clicked_item < results.count)) EventRunFile();
+							if ((prev_cur_y == select_list.cur_y) && (clicked_item < results.count)) EventRunFile();
 						}
 
 						if (mouse.key&MOUSE_RIGHT) && (mouse.up) {
-							if ((prev_cur_y == select_list.cur_y) && (clicked_item < results.count)) EventShowFileInFolder();
+							if ((prev_cur_y == select_list.cur_y) && (clicked_item < results.count)) EventShowFileInFolder();
 						}
 				}
 			}
@@ -222,8 +222,7 @@ void SelectList_DrawLine(dword i)
 	} else {
 		strcpy(#tname, results.name.get(select_list.first + i));
 		strlwr(#tname);
-		icons_ini.section = "icons18";
-		icon = icons_ini.GetInt(#tname + strrchr(#tname, '.'), 2);
+		icon = ini_icons.get(0, #tname + strrchr(#tname, '.'), 18);
 	}
 
 	#define ICONX 7

misc/unimg.c

@@ -94,6 +94,9 @@ int fat_off;
 int root_off;
 int data_off;
 
+int lfn_nonascii;
+int lfn_checksum;
+
 char cur_path[4096];
 int  cur_path_len;
 
@@ -150,7 +153,6 @@ void extract_file(dword buf, int size, int cluster)
 	while (cluster >= 2) && (cluster < 0xFF7) {
 		src = cluster_to_offset(cluster);
 		n = bpc;
-		// clamp to remaining size
 		if (written + n > size) n = size - written;
 		if (n <= 0) break;
 		// Stop on a corrupt FAT chain pointing outside the image
@@ -166,7 +168,6 @@ void make_parent_dirs(dword initial_dir)
 	char path[4096];
 	int i;
 	strncpy(#path, initial_dir, strlen(initial_dir) + 1);
-	//debugln(#path);
 	for (i = 1; path[i]; i++) {
 		if (path[i] == '/') {
 			path[i] = '\0';
@@ -183,7 +184,6 @@ int entry_short_name(int off, dword out)
 	if (!b) return -1;
 	if (b == 0xE5) return 0;
 	attr = fat_u8(off + 11);
-	if (attr & 0x0F == 0x0F) return 0;
 	if (attr & 0x08) return 0;
 
 	n = 0;
@@ -208,23 +208,110 @@ int entry_short_name(int off, dword out)
 	return n;
 }
 
-int handle_entry(int off)
+// Extracts characters from an LFN record. 
+// Zeroes the buffer when the end of line (0x0000 or 0xFFFF) is encountered.
+int get_lfn_chars(int off, dword out)
 {
-	char  name[13];
-	int   nlen, attr, cluster, size, saved_len;
+	int i, c, pos;
+	// LFN stores 13 UCS-2 chars at non-contiguous offsets 1..10, 14..25, 28..31
+	// (gaps: 11..13 attr/type/checksum, 26..27 cluster).
+	i = 1;
+	for (pos = 0; pos < 13; pos++) {
+		c = fat_u16(off + i);
+		if (c == 0x0000) || (c == 0xFFFF) { ESBYTE[out+pos] = 0; return pos; }
+		if (c > 0x7F) lfn_nonascii = 1;
+		ESBYTE[out + pos] = c & 0xFF;
+		i += 2;
+		if (i == 11) i = 14;
+		if (i == 26) i = 28;
+	}
+	ESBYTE[out + pos] = 0;
+	return pos;
+}
+
+// Returns -1 to stop iteration, 0 to continue.
+int process_one_entry(int entry_off, dword lfn_buf, dword p_seq)
+{
+	char chunk[15];
+	int b, attr, seq, chunk_len, dest_offset;
+
+	b = fat_u8(entry_off);
+	if (!b) return -1;
+	if (b == 0xE5) { ESDWORD[p_seq] = -1; return 0; }
+
+	attr = fat_u8(entry_off + 11);
+	if (attr == 0x0F) {
+		seq = b;
+		if (seq & 0x40) {
+			seq &= 0x3F;
+			if (seq < 1) || (seq > 20) { ESDWORD[p_seq] = -1; return 0; }
+			ESDWORD[p_seq] = seq;
+			lfn_nonascii = 0;
+			lfn_checksum = fat_u8(entry_off + 13);
+			EDI = lfn_buf; ECX = 65; EAX = 0; MEMSETD(EDI, ECX, EAX);
+		}
+		if (seq == ESDWORD[p_seq]) {
+			chunk_len = get_lfn_chars(entry_off, #chunk);
+			dest_offset = seq - 1;
+			dest_offset *= 13;
+			memmov(lfn_buf + dest_offset, #chunk, chunk_len);
+			ESDWORD[p_seq] = ESDWORD[p_seq] - 1;
+		} else {
+			ESDWORD[p_seq] = -1;
+		}
+	} else {
+		if (ESDWORD[p_seq] == 0) {
+			if (handle_entry(entry_off, lfn_buf) < 0) return -1;
+		} else {
+			if (handle_entry(entry_off, NULL) < 0) return -1;
+		}
+		ESDWORD[p_seq] = -1;
+		ESBYTE[lfn_buf] = 0;
+	}
+	return 0;
+}
+
+int handle_entry(int off, dword lfn_name)
+{
+	char  name[256];
+	int   nlen, attr, cluster, size, saved_len, use_lfn, sum, hi, i;
 	dword buf;
 
 	if (off < 0) || (off + 32 > img_sz) {
 		return -1;
 	}
 
-	nlen = entry_short_name(off, #name);
+	attr = fat_u8(off + 11);
+	if (attr == 0x0F) return 0;
 
-	if (nlen < 0) return -1;
-	if (nlen == 0) return 0;
-	if (name[0] == '.') return 0;
+	// Verify LFN checksum against the short-name field (off..off+10).
+	use_lfn = 0;
+	if (lfn_name) && (ESBYTE[lfn_name]) && (!lfn_nonascii) {
+		sum = 0;
+		for (i = 0; i < 11; i++) {
+			hi = sum & 1;
+			hi = hi << 7;
+			sum = sum >> 1;
+			sum = sum + hi;
+			sum = sum + fat_u8(off + i);
+			sum = sum & 0xFF;
+		}
+		if (sum == lfn_checksum) use_lfn = 1;
+	}
+
+	if (use_lfn) {
+		strncpy(#name, lfn_name, 255);
+		nlen = strlen(#name);
+	} else {
+		nlen = entry_short_name(off, #name);
+		if (nlen < 0) return -1;
+		if (nlen == 0) return 0;
+	}
+
+	// Skip only the "." and ".." directory entries (a real LFN name may start with '.').
+	if (name[0] == '.') && (name[1] == '\0') return 0;
+	if (name[0] == '.') && (name[1] == '.') && (name[2] == '\0') return 0;
 
-	attr    = fat_u8(off + 11);
 	cluster = fat_u16(off + 26);
 
 	saved_len = cur_path_len;
@@ -258,12 +345,16 @@ int handle_entry(int off)
 
 void handle_folder(int cluster)
 {
-	int off, entries, i;
+	int off, entries, i, entry_off;
+	int lfn_expected_seq;
+	char lfn_buf[260];
+
+	lfn_buf[0] = 0;
+	lfn_expected_seq = -1;
+
 	while (cluster >= 2) && (cluster < 0xFF7) {
 		off = cluster_to_offset(cluster);
 
-		// Check that offset don't go negative
-		// and we don't read over img size (img_sz)
 		if (off < 0) || (off + bpc > img_sz) {
 			notify(MSG_OOB);
 			return;
@@ -271,7 +362,8 @@ void handle_folder(int cluster)
 
 		entries = bpc / 32;
 		for (i = 0; i < entries; i++) {
-			if (handle_entry(i * 32 + off) < 0) return;
+			entry_off = i * 32 + off;
+			if (process_one_entry(entry_off, #lfn_buf, #lfn_expected_seq) < 0) return;
 		}
 		cluster = next_cluster(cluster);
 	}
@@ -288,7 +380,8 @@ void main()
 {
 	char img_file[4096];
 	char img_info[512];
-	int  i;
+	char root_lfn[260];
+	int  i, entry_off, lfn_expected_seq;
 
 	mem_init();
 
@@ -312,8 +405,8 @@ void main()
 	cur_path_len = strlen(#cur_path);
 
 	read_file(#img_file, #img_ptr, #img_sz);
- 	if (!img_ptr) || (!img_sz) {
- 		NotifyAndExit(MSG_READ, #img_file);
+	if (!img_ptr) || (!img_sz) {
+		NotifyAndExit(MSG_READ, #img_file);
 	}
 
 	fat12__open();
@@ -327,8 +420,11 @@ void main()
 		NotifyAndExit(MSG_MKDIR, #cur_path);
 	}
 
+	root_lfn[0] = 0;
+	lfn_expected_seq = -1;
 	for (i = 0; i < mre; i++) {
-		if (handle_entry(i * 32 + root_off) < 0) break;
+		entry_off = i * 32 + root_off;
+		if (process_one_entry(entry_off, #root_lfn, #lfn_expected_seq) < 0) break;
 	}
 
 	NotifyAndExit(MSG_DONE, #cur_path);