unimg: make labels shorter and more common

- change all line endings to CRLF
- remove redundant kolibri.h include

lib/fs.h

@@ -260,7 +260,7 @@ inline fastcall void GetCurDir( ECX, EDX)
    previous but here virtual folders like
    '/' and '/tmp' are not recognised as FOLDERS
    by GetFileInfo() => BDVK.isfolder attribute :( */
-bool real_dir_exists(dword fpath)
+:bool real_dir_exists(dword fpath)
 {
 	BDVK fpath_atr;
 	if (GetFileInfo(fpath, #fpath_atr) != 0) return false; 

lib/strings.h

@@ -905,16 +905,20 @@ inline signed csshexdec(dword text)
 :dword miniprintf(dword dst, format, insert_line)
 {
 	dword in_pos = strchr(format, '%');
-	EBX = ESBYTE[EAX+1];
-	if (EBX == 's') {
-		strncpy(dst, format, in_pos - format);
-		strcat(dst, insert_line);
-		strcat(dst, in_pos+2);
-	}
-	if (EBX == 'd') || (EBX == 'i') {
-		strncpy(dst, format, in_pos - format);
-		strcat(dst, itoa(insert_line));
-		strcat(dst, in_pos+2);	
+	if (!in_pos) || (!insert_line) {
+		strcpy(dst, format);
+	} else {	
+		EBX = ESBYTE[EAX+1];
+		if (EBX == 's') {
+			strncpy(dst, format, in_pos - format);
+			strcat(dst, insert_line);
+			strcat(dst, in_pos+2);
+		}
+		if (EBX == 'd') || (EBX == 'i') {
+			strncpy(dst, format, in_pos - format);
+			strcat(dst, itoa(insert_line));
+			strcat(dst, in_pos+2);	
+		}
 	}
 	return dst;
 }

misc/unimg.c

@@ -0,0 +1,310 @@
+/*  # KolibriOS Image Unpacker #
+
+FAT12 floppy image unpacker.
+
+Usage:  unimg path/to/img [output/folder]
+        If output folder is skipped, the image will be unpacked at /TMP0/1/[file-name.ext]
+
+Author: Magomed Kostoev (Boppan, mkostoevr): author of initial version in C
+Kyryl Lipatov (Leency): rewrite to C--, use any image type. */
+
+#define MEMSIZE 1024*30
+#define ENTRY_POINT #main
+
+#include "../lib/fs.h"
+
+// NB: this file is stored in CP866 (for the Russian strings below).
+//     Edit it with a CP866-aware editor, not UTF-8.
+#ifdef LANG_RUS
+?define MSG_USAGE    "'unimg\nРаспаковщик дискет FAT12.\nИспользование: unimg /путь/к/образу [\"/папка/вывода\"]' -tI"
+?define MSG_READ     "'unimg\nОшибка чтения файла\n%s' -tE"
+?define MSG_FORMAT   "'unimg\nОбраз не FAT12.\n%s' -tE"
+?define MSG_MKDIR    "'unimg\nОшибка создания папки\n%s' -tE"
+?define MSG_DONE     "'unimg\nРаспаковано в:\n%s' -tO"
+?define MSG_NOMEM    "'unimg\nНедостаточно памяти' -tE"
+?define MSG_OOB      "'unimg\nКластера FAT вне границ' -tE"
+?define INFO_NAME    "\nВнутреннее имя      "
+?define INFO_BPS     "\nБайт на сектор      "
+?define INFO_SPC     "\nСекторов в кластере "
+?define INFO_RSC     "\nРезервных секторов  "
+?define INFO_NFAT    "\nКоличество FAT      "
+?define INFO_MRE     "\nЗаписей в корне     "
+?define INFO_BPC     "\nБайт в кластере     "
+?define INFO_SPF     "\nСекторов на FAT     "
+?define INFO_FATOFF  "\nПервая FAT          "
+?define INFO_ROOTOFF "\nКорневой каталог    "
+?define INFO_DATAOFF "\nОбласть данных      "
+#else
+?define MSG_USAGE    "'unimg\nFAT12 floppy image unpacker.\nUsage: unimg /path/to/img [\"/output/dir\"]' -tI"
+?define MSG_READ     "'unimg\nFile read error\n%s' -tE"
+?define MSG_FORMAT   "'unimg\nNot a FAT12 image.\n%s' -tE"
+?define MSG_MKDIR    "'unimg\nCannot create output folder\n%s' -tE"
+?define MSG_DONE     "'unimg\nUnpacked to\n%s' -tO"
+?define MSG_NOMEM    "'unimg\nOut of memory' -tE"
+?define MSG_OOB      "'unimg\nFAT cluster out of bounds' -tE"
+?define INFO_NAME    "\nInternal name       "
+?define INFO_BPS     "\nBytes per sector    "
+?define INFO_SPC     "\nSectors per cluster "
+?define INFO_RSC     "\nReserved sectors    "
+?define INFO_NFAT    "\nNumber of FATs      "
+?define INFO_MRE     "\nMax root entries    "
+?define INFO_BPC     "\nBytes per cluster   "
+?define INFO_SPF     "\nSectors per FAT     "
+?define INFO_FATOFF  "\nFirst FAT           "
+?define INFO_ROOTOFF "\nRoot directory      "
+?define INFO_DATAOFF "\nData region         "
+#endif
+
+dword img_ptr;
+dword img_sz;
+
+int bps;
+int spc;
+int rsc;
+int nfat;
+int mre;
+int spf;
+int bpc;
+int fat_off;
+int root_off;
+int data_off;
+
+char cur_path[4096];
+int  cur_path_len;
+
+inline int fat_u8(int offset) { return DSBYTE[img_ptr + offset] & 0xFF; }
+inline int fat_u16(int offset) { return DSWORD[img_ptr + offset] & 0xFFFF; }
+inline dword fat_u32(int offset) { return ESDWORD[img_ptr + offset]; }
+
+void fat12__open()
+{
+	bps      = fat_u16(11);
+	spc      = fat_u8(13);
+	rsc      = fat_u16(14);
+	nfat     = fat_u8(16);
+	mre      = fat_u16(17);
+	spf      = fat_u16(22);
+	bpc      = bps * spc;
+	fat_off  = rsc * bps;
+	root_off = nfat * spf * bps + fat_off;
+	data_off = mre * 32 + root_off;
+}
+
+dword GetImageInfo(dword buf)
+{
+	//strcpy(buf, INFO_NAME);    strncpy(buf+21, img_ptr+3, 8);
+	strcat(buf, INFO_BPS);     strcat(buf, itoa(bps));
+	strcat(buf, INFO_SPC);     strcat(buf, itoa(spc));
+	strcat(buf, INFO_RSC);     strcat(buf, itoa(rsc));
+	strcat(buf, INFO_NFAT);    strcat(buf, itoa(nfat));
+	strcat(buf, INFO_MRE);     strcat(buf, itoa(mre));
+	strcat(buf, INFO_BPC);     strcat(buf, itoa(bpc));
+	strcat(buf, INFO_SPF);     strcat(buf, itoa(spf));
+	strcat(buf, INFO_FATOFF);  strcat(buf, itoa(fat_off));
+	strcat(buf, INFO_ROOTOFF); strcat(buf, itoa(root_off));
+	strcat(buf, INFO_DATAOFF); strcat(buf, itoa(data_off));
+}
+
+int cluster_to_offset(int c)
+{
+	return c - 2 * bpc + data_off;
+}
+
+int next_cluster(int c)
+{
+	int v;
+	v = fat_u16(c / 2 + fat_off + c);
+	if (c & 1) return v >> 4;
+	return v & 0xFFF;
+}
+
+void extract_file(dword buf, int size, int cluster)
+{
+	int written, n, src;
+	written = 0;
+	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
+		if (src < 0) || (src + n > img_sz) break;
+		memmov(buf + written, img_ptr + src, n);
+		written += n;
+		cluster = next_cluster(cluster);
+	}
+}
+
+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';
+			CreateDir(#path);
+			path[i] = '/';
+		}
+	}
+}
+
+int entry_short_name(int off, dword out)
+{
+	int attr, i, n, b;
+	b = fat_u8(off);
+	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;
+	for (i = 0; i < 8; i++) {
+		b = fat_u8(off + i);
+		if (b == ' ') break;
+		ESBYTE[out + n] = b;
+		n++;
+	}
+	b = fat_u8(off + 8);
+	if (b != ' ') {
+		ESBYTE[out + n] = '.';
+		n++;
+		for (i = 8; i < 11; i++) {
+			b = fat_u8(off + i);
+			if (b == ' ') break;
+			ESBYTE[out + n] = b;
+			n++;
+		}
+	}
+	ESBYTE[out + n] = '\0';
+	return n;
+}
+
+int handle_entry(int off)
+{
+	char name[13];
+	int  nlen, attr, cluster, size, saved_len;
+	dword buf;
+
+	if (off < 0) || (off + 32 > img_sz) {
+		return -1; 
+	}
+
+	nlen = entry_short_name(off, #name);
+
+	if (nlen < 0) return -1;
+	if (nlen == 0) return 0;
+	if (name[0] == '.') return 0;
+
+	attr    = fat_u8(off + 11);
+	cluster = fat_u16(off + 26);
+
+	saved_len = cur_path_len;
+	cur_path[cur_path_len] = '/';
+	memmov(#cur_path + cur_path_len + 1, #name, nlen + 1);
+	cur_path_len = cur_path_len + 1 + nlen;
+
+	if (attr & 0x10) {
+		CreateDir(#cur_path);
+		handle_folder(cluster);
+	} else {
+		size = fat_u32(off + 28);
+		if (size > 0) {
+			buf = malloc(size);
+			if (!buf) {
+				notify(MSG_NOMEM);
+			} else {
+				extract_file(buf, size, cluster);
+				CreateFile(size, buf, #cur_path);
+				free(buf);
+			}
+		} else {
+			CreateFile(0, img_ptr, #cur_path);
+		}
+	}
+
+	cur_path_len = saved_len;
+	cur_path[cur_path_len] = '\0';
+	return 0;
+}
+
+void handle_folder(int cluster)
+{
+	int off, entries, i;
+	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;
+		}
+
+		entries = bpc / 32;
+		for (i = 0; i < entries; i++) {
+			if (handle_entry(i * 32 + off) < 0) return;
+		}
+		cluster = next_cluster(cluster);
+	}
+}
+
+void NotifyAndExit(dword message, opt)
+{
+	miniprintf(#param, message, opt);
+	notify(#param);
+	ExitProcess();
+}
+
+void main()
+{
+	char img_file[4096];
+	char img_info[512];
+	int  i;
+
+	mem_init();
+
+	if (!param[0]) {
+		NotifyAndExit(MSG_USAGE, NULL);
+	}
+
+	if (i = strchr(#param, '"')) {
+		ESBYTE[i-1] = '\0';
+		strcpy(#cur_path, i+1);
+		i = strchr(#cur_path, '"');
+		if (i) ESBYTE[i] = '\0';
+	}
+
+	strcpy(#img_file, #param);
+
+	if (!cur_path[0]) {
+		memmov(#cur_path, "/tmp0/1", 8);
+		strcat(#cur_path, #img_file + strrchr(#img_file, '/') - 1);
+	}
+	cur_path_len = strlen(#cur_path);
+
+	read_file(#img_file, #img_ptr, #img_sz);
+ 	if (!img_ptr) || (!img_sz) {
+ 		NotifyAndExit(MSG_READ, #img_file);
+	}
+
+	fat12__open();
+	if (root_off > img_sz) || (data_off > img_sz) {
+		GetImageInfo(#img_info);
+		NotifyAndExit(MSG_FORMAT, #img_info);
+	}
+
+	make_parent_dirs(#cur_path);
+	if (CreateDir(#cur_path)) {
+		NotifyAndExit(MSG_MKDIR, #cur_path);
+	}
+
+	for (i = 0; i < mre; i++) {
+		if (handle_entry(i * 32 + root_off) < 0) break;
+	}
+
+	NotifyAndExit(MSG_DONE, #cur_path);
+}