WebSVN – Kolibri OS – Diff – /programs/fs/unimg/fat12.c

         If output folder is skipped, the image will be unpacked at /TMP0/1/[file-name]
 Author: Magomed Kostoev (Boppan, mkostoevr): FAT12 file system, driver.
+Contributor: Kiril Lipatov (Leency) */
+#ifdef __TINYC__
+#   define TCC 1
+#else
+#   define GCC 1
-Contributor: Kiril Lipatov (Leency) */
+#endif
 #include
 #include
 #include
 #include
 #include
+#if TCC
-#define TCC 0
+#   include
+#   define printf con_printf
-#define GCC 1
+#   define puts con_write_asciiz
-#include "compiller.h"
+#else
 #   define con_init_console_dll() 0
-#ifdef GCC
+#   define con_set_title(s)
-#define con_init con_init
+#   define con_exit(close)
 #endif
 static int fat12__forEachFile(const Fat12 *this, ForEachCallback callback, void *callbackParam);
 static int fat12__open(Fat12 *this, const char *img);
 static int fat12__error(Fat12 *this, const char *errorMessage);
-static void mkdir(const char *name) {
-    #ifdef TCC
+static void mkdir(const char *name) {
     struct {
         int fn;
         int unused[4];
         char b;
         const char *path __attribute__((packed));
     } info;
-    #else
-    struct {
-        int fn;
-        int unused[4];
-        char b;
-        const char *path;
-    }  __attribute__((packed)) info;
     #endif
     memset(&info, 0, sizeof(info));
     info.fn = 9;
     info.b = 0;
     info.path = name;
     return 0;
+}
 static int handleError(const Fat12 *fat12) {
+    printf("Error in Fat12: %s\n", fat12->errorMessage);
-    printf("Error in Fat12: %s\n", fat12->errorMessage);
+    con_exit(0);
     return -1;
+}
-void writeFile(const char *fileName, int size, const uint8_t *data) {
-//    FILE *fp = NULL;
-//    if (!(fp = fopen(fileName, "wb"))) { perror(NULL); }
-//    fwrite(data, 1, size, fp);
+void writeFile(const char *fileName, int size, const uint8_t *data) {
-//    fclose(fp);
+#if TCC
     struct Info {
         int number;
         int reserved0;
         int reserved1;
         int dataSize;
         const void *data;
         char zero;
+        const char *name __attribute__((packed));
-        const char *name;
+    } info;
-    } __attribute__((packed)) *info = calloc(sizeof(struct Info), 1);
+    memset(&info, 0, sizeof(struct Info));
-    info->number = 2; // create/overwrite file
+    info.number = 2; // create/overwrite file
-    info->dataSize = size;
+    info.dataSize = size;
-    info->data = data;
+    info.data = data;
+    info.zero = 0;
+    info.name = fileName;
+    asm volatile ("int $0x40" :: "a"(70), "b"(&info));
+#else
+    FILE *fp = NULL;
+    if (!(fp = fopen(fileName, "wb"))) { perror(NULL); }
-    info->zero = 0;
+    fwrite(data, 1, size, fp);
-    info->name = fileName;
+    fclose(fp);
-    asm volatile ("int $0x40" :: "a"(70), "b"(info));
+#endif
             mkdir_p(outputPath->data);
             *fileNameDelim = '/';
+        }
+    }
     printf("Extracting %s\n", outputPath->data);
-    #ifdef TCC
-        FILE *fp = NULL;
-        if (!(fp = fopen(outputPath->data, "wb"))) { perror(NULL); }
-        fwrite(data, 1, size, fp);
-        fclose(fp);
-    #else
-        writeFile(outputPath->data, size, data);
+    writeFile(outputPath->data, size, data);
-    #endif
     outputPath->data[outputPath->length] = '\0';
     return 0;
+}
 int main(int argc, char* argv[]) {
     Fat12 fat12 = { 0 };
     char *imageFile = NULL;
     String outputFolder = { 0 };
-    int exit_code = 0;
+    int closeOnExit = 0;
-    char app_title[] = "UnImg - kolibri.img file unpacker";
+    if (con_init_console_dll()) { return -1; }
-    con_init(-1, -1, -1, 350, app_title);
+    con_set_title("UnImg - kolibri.img file unpacker");
     if (argc < 2) {
         puts(" Usage:");
         puts(" unimg \"/path/to/kolibri.img\" \"/optional/extract/path\"");
         puts("       where optional key [-e] is exit on success");
-        exit(exit_code);
+        con_exit(0);
         return -1;
     } else {
-    	imageFile = argv[1];
+        imageFile = argv[1];
-    	printf("File: %s\n", imageFile);
+        printf("File: %s\n", imageFile);
+    }
     outputFolder.capacity = 4096;
     outputFolder.data = malloc(outputFolder.capacity);
     //! ACHTUNG: possible buffer overflow, is 4096 enough in KolibriOS?
-    if (argc >= 3 && argv[2][0] != '-') strcpy(outputFolder.data, argv[2]);
+    if (argc >= 3 && argv[2][0] != '-') { strcpy(outputFolder.data, argv[2]); }
     else {
-    	strcpy(outputFolder.data, "/tmp0/1");
+        strcpy(outputFolder.data, "/tmp0/1");
-    	strcat(outputFolder.data, strrchr(imageFile, '/'));
+        strcat(outputFolder.data, strrchr(imageFile, '/'));
-    }
+    }
     outputFolder.length = strlen(outputFolder.data);
     outputFolder.length = strlen(outputFolder.data);
     // handle -e parameter - exit on success
-    if (argc >= 3 && !strcmp(argv[argc - 1], "-e")) { exit_code = 1; }
+    // handle -e parameter - exit on success
+    if (argc >= 3 && !strcmp(argv[argc - 1], "-e")) { closeOnExit = 1; }

Subversion Repositories Kolibri OS

(root)/programs/fs/unimg/fat12.c – Rev 7869 → 7882