Changeset 1961

Timestamp:

02/28/09 17:34:21 (3 years ago)

Author:

mwhitworth

Message:

Add checks for when a user specifies a FAT size that cannot be satisfied.

Files:

• Whitix/tags/0.2b/user/makefs/fat/main.c (modified) (2 diffs)

Whitix/tags/0.2b/user/makefs/fat/main.c

@@ -319 +319 @@
                         numClusts32 = 0;
                 }
+                
+                if (numClusts32 < 65526)
+                {
+                        if (verbose)
+                                printf("FAT32: too few clusters\n");
+                                
+                        numClusts32 = 0;
+                }
 
                 if (numClusts12 || numClusts16 || numClusts32)
@@ -326 +334 @@
         }while (secsPerClus && secsPerClus <= 128);
 
-        if (!fatSize)
-        {
-                fatSize=(numClusts16 > numClusts12) ? 16 : 12;
-                
-                if (numClusts32 > numClusts16)
-                        fatSize = 32;
-
-                if (verbose)
-                        printf("Chose FAT%d\n",fatSize);
+        switch (fatSize)
+        {
+                case 12:
+                        break;
+                
+                case 16:
+                        break;
+                
+                case 32:
+                        if (numClusts32 == 0)
+                        {
+                                printf("mkfatfs: error: FAT32 filesystem would be misdetected as FAT12 or FAT16\n");
+                                return 1;
+                        }
+                        break;
+                        
+                case 0:
+                        fatSize=(numClusts16 > numClusts12) ? 16 : 12;
+                
+                        if (numClusts32 > numClusts16)
+                                fatSize = 32;
+
+                        if (verbose)
+                                printf("Chose FAT%d\n",fatSize);
         }