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

 #include
 #include
 #include
 #include
 #include
-#include
 typedef struct {
     size_t length;
     size_t capacity;
 static void mkdir(const char *name) {
     struct {
         int fn;
         int unused[4];
         char b;
-        const char *path __attribute__((packed));
+        const char *path;
-    } info;
+    } __attribute__((packed)) info;
     memset(&info, 0, sizeof(info));
     info.fn = 9;
     info.b = 0;
     info.path = name;
     asm volatile ("int $0x40"::"a"(70), "b"(&info));
     this->sectorsPerFat = *(uint16_t *)((uintptr_t)this->image + 0x16);
     this->firstFat = (0 + this->reservedSectorCount) * this->bytesPerSector;
     this->rootDirectory = this->firstFat + this->numberOfFats
         * this->sectorsPerFat * this->bytesPerSector;
     this->dataRegion = this->rootDirectory + this->maxRootEntries * 32;
-    con_printf("\nBytes per sector: %d\n",      this->bytesPerSector);
+    printf("\nBytes per sector: %d\n",    this->bytesPerSector);
-    con_printf("Sectors per claster: %d\n",   this->sectorsPerClaster);
+    printf("Sectors per claster: %d\n",   this->sectorsPerClaster);
-    con_printf("Reserver sector count: %d\n", this->reservedSectorCount);
+    printf("Reserver sector count: %d\n", this->reservedSectorCount);
-    con_printf("Number of FATs: %d\n",        this->numberOfFats);
+    printf("Number of FATs: %d\n",        this->numberOfFats);
-    con_printf("Max root entries: %d\n",      this->maxRootEntries);
+    printf("Max root entries: %d\n",      this->maxRootEntries);
-    con_printf("Total sectors: %d\n",         this->totalSectors);
+    printf("Total sectors: %d\n",         this->totalSectors);
-    con_printf("Sectors per FAT: %d\n",       this->sectorsPerFat);
+    printf("Sectors per FAT: %d\n",       this->sectorsPerFat);
-    con_printf("First FAT: %d\n",             this->firstFat);
+    printf("First FAT: %d\n",             this->firstFat);
-    con_printf("Root directory: %d\n",        this->rootDirectory);
+    printf("Root directory: %d\n",        this->rootDirectory);
-    con_printf("Data region: %d\n\n",           this->dataRegion);
+    printf("Data region: %d\n\n",         this->dataRegion);
     return 1;
+}
 static int fat12__error(Fat12 *this, const char *errorMessage) {
     this->errorMessage = errorMessage;
     return 0;
+}
-static int handleError(const Fat12 *fat12) {
-    con_printf("Error in Fat12: %s\n", fat12->errorMessage);
+static int handleError(const Fat12 *fat12) {
-    con_exit(0);
+    printf("Error in Fat12: %s\n", fat12->errorMessage);
+    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);
+//    fclose(fp);
+    struct Info {
+        int number;
+        int reserved0;
+        int reserved1;
+        int dataSize;
+        const void *data;
+        char zero;
+        const char *name;
+    } __attribute__((packed)) *info = calloc(sizeof(struct Info), 1);
+    info->number = 2; // create/overwrite file
+    info->dataSize = size;
+    info->data = data;
+    info->zero = 0;
+    info->name = fileName;
-    return -1;
+    asm volatile ("int $0x40" :: "a"(70), "b"(info));
-}
+}
 static int callback(const char *name, size_t size, const uint8_t *data, void *param) {
-    FILE *fp = NULL;
+static int callback(const char *name, size_t size, const uint8_t *data, void *param) {
     String *outputPath = param;
             *fileNameDelim = '\0';
             mkdir_p(outputPath->data);
             *fileNameDelim = '/';
+        }
+    }
-    con_printf("Extracting %s\n", outputPath->data);
+    printf("Extracting %s\n", outputPath->data);
-    if (!(fp = fopen(outputPath->data, "wb"))) { perror(NULL); }
-    fwrite(data, 1, size, fp);
+    writeFile(outputPath->data, size, data);
-    fclose(fp);
     outputPath->data[outputPath->length] = '\0';
     return 0;
+}
 int main(int argc, char **argv) {
-    Fat12 fat12 = { 0 };
-    char *imageFile = NULL;
-    String outputFolder = { 0 };
-    int exit = 0;
     Fat12 fat12 = { 0 };
-	char app_title[] = "UnImg - kolibri.img file unpacker";
+    char *imageFile = NULL;
-	if (con_init_console_dll_param(-1, -1, -1, 350, app_title)) return -1;
+    String outputFolder = { 0 };
-    if (argc < 2) {
         con_write_asciiz(" Usage:\n");
-        con_write_asciiz(" unimg \"/path/to/kolibri.img\" \"/optional/extract/path\" [-e]\n");
+    if (argc < 2) {
-        con_write_asciiz("        where optional key [-e] is exit on success");
+        puts(" Usage:\n");
-        con_exit(0);
+        puts(" unimg \"/path/to/kolibri.img\" \"/optional/extract/path\"\n");
         return -1;
     } else {
     	imageFile = argv[1];
     	strcat(outputFolder.data, strrchr(imageFile, '/'));
+    }
-    outputFolder.length = strlen(outputFolder.data);
-    // handle -e parameter - exit on success
-    if (argc >= 3 && !strcmp(argv[argc - 1], "-e")) { exit = 1; }
+    outputFolder.length = strlen(outputFolder.data);
     if (!fat12__open(&fat12, imageFile)) {
         return handleError(&fat12);
+    }
     if (!fat12__forEachFile(&fat12, callback, &outputFolder)) {
-        return handleError(&fat12);
         return handleError(&fat12);

Subversion Repositories Kolibri OS

(root)/programs/fs/unimg/fat12.c – Rev 7867 → 7868