Changes in uspace/app/mkfat/mkfat.c [f73b291:ed9bf14] in mainline

File:

• uspace/app/mkfat/mkfat.c (modified) (4 diffs)

uspace/app/mkfat/mkfat.c

@@ -102 +102 @@
         cfg.addt_res_sectors = 0;
         cfg.root_ent_max = 128;
-        cfg.fat_type = FAT16;
+        cfg.fat_type = FATAUTO;
 
         if (argc < 2) {
@@ -162 +162 @@
         }
 
-        rc = block_init(EXCHANGE_SERIALIZE, service_id, 2048);
+        rc = block_init(service_id, 2048);
         if (rc != EOK)  {
                 printf(NAME ": Error initializing libblock.\n");
@@ -189 +189 @@
         }
 
-        if (cfg.fat_type != FAT12 && cfg.fat_type != FAT16 && cfg.fat_type != FAT32) {
+        if (cfg.fat_type != FATAUTO && cfg.fat_type != FAT12 && cfg.fat_type != FAT16 &&
+            cfg.fat_type != FAT32) {
                 printf(NAME ": Error. Unknown FAT type.\n");
                 return 2;
@@ -247 +248 @@
             cfg->sectors_per_cluster);
 
-        if ((cfg->fat_type == FAT12 && cfg->total_clusters > FAT12_CLST_MAX) ||
-            (cfg->fat_type == FAT16 && (cfg->total_clusters <= FAT12_CLST_MAX ||
-            cfg->total_clusters > FAT16_CLST_MAX)) ||
-            (cfg->fat_type == FAT32 && cfg->total_clusters <= FAT16_CLST_MAX))
-                return ENOSPC;
+        if (cfg->total_clusters <= FAT12_CLST_MAX) {
+                if (cfg->fat_type == FATAUTO)
+                        cfg->fat_type = FAT12;
+                else if (cfg->fat_type != FAT12)
+                        return EINVAL;
+        } else if (cfg->total_clusters <= FAT16_CLST_MAX) {
+                if (cfg->fat_type == FATAUTO)
+                        cfg->fat_type = FAT16;
+                else if (cfg->fat_type != FAT16)
+                        return EINVAL;
+        } else {
+                if (cfg->fat_type == FATAUTO)
+                        cfg->fat_type = FAT32;
+                else if (cfg->fat_type != FAT32)
+                        return EINVAL;
+        }
 
         fat_bytes = div_round_up((cfg->total_clusters + 2) *