Changeset ed9bf14 in mainline

Timestamp:

2015-11-07T23:46:59Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f63a0073

Parents:

44183b98

Message:

mkfat can live without the user specifying the FAT type just fine. This fixes FAT creation via fdisk for sizes not corresponding to FAT16 (i.e. too small or too large).

Location:

uspace/app/mkfat

Files:

• fat.h (modified) (1 diff)
• mkfat.c (modified) (3 diffs)

uspace/app/mkfat/fat.h

@@ -43 +43 @@
 #define FAT16_CLST_MAX    65525
 
+#define FATAUTO 0
 #define FAT12   12
 #define FAT16   16

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) {
@@ -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) *