Changeset d7f09583 in mainline

Timestamp:

2012-02-27T19:48:09Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

2601383

Parents:

9ce1acf

Message:

mkexfat: try to prevent the user from specifying a cluster size too big for the device.

File:

• uspace/app/mkexfat/mkexfat.c (modified) (7 diffs)

uspace/app/mkexfat/mkexfat.c

@@ -146 +146 @@
         aoff64_t const volume_bytes = (cfg->volume_count - FAT_SECTOR_START) *
             cfg->sector_size;
-        aoff64_t n_req_clusters;
 
         if (cfg->cluster_size != 0) {
                 /* The user already choose the cluster size he wants */
-                n_req_clusters = volume_bytes / cfg->cluster_size;
+                cfg->total_clusters = volume_bytes / cfg->cluster_size;
                 goto skip_cluster_size_set;
         }
 
-        n_req_clusters = volume_bytes / DEFAULT_CLUSTER_SIZE;
+        cfg->total_clusters = volume_bytes / DEFAULT_CLUSTER_SIZE;
         cfg->cluster_size = DEFAULT_CLUSTER_SIZE;
 
@@ -161 +160 @@
          * size less or equal to 64 Mb.
          */
-        while (n_req_clusters > 16000000ULL &&
+        while (cfg->total_clusters > 16000000ULL &&
             (cfg->cluster_size < 32 * 1024 * 1024)) {
 
                 cfg->cluster_size <<= 1;
-                n_req_clusters = div_round_up(volume_bytes, cfg->cluster_size);
+                cfg->total_clusters = div_round_up(volume_bytes,
+                    cfg->cluster_size);
         }
 
 skip_cluster_size_set:
 
-        /* The first two clusters are reserved */
-        cfg->total_clusters = n_req_clusters + 2;
-
         /* Compute the FAT size in sectors */
-        fat_bytes = (cfg->total_clusters + 1) * 4;
+        fat_bytes = (cfg->total_clusters + 3) * sizeof(uint32_t);
         cfg->fat_sector_count = div_round_up(fat_bytes, cfg->sector_size);
 
@@ -182 +179 @@
 
         /* Compute the bitmap size */
-        cfg->bitmap_size = div_round_up(n_req_clusters, 8);
+        cfg->bitmap_size = div_round_up(cfg->total_clusters, 8);
 
         /* Compute the number of clusters reserved to the bitmap */
@@ -194 +191 @@
         cfg->allocated_clusters += div_round_up(sizeof(upcase_table),
             cfg->cluster_size);
+
+        /* Subtract the FAT and bootsector space from the total
+         * number of available clusters.
+         */
+        cfg->total_clusters -= div_round_up(cfg->data_start_sector *
+            cfg->sector_size, cfg->cluster_size);
 
         /* Will be set later */
@@ -219 +222 @@
         printf(NAME ": Data start sector:     %lu\n", cfg->data_start_sector);
         printf(NAME ": Total num of clusters: %lu\n", cfg->total_clusters);
+        printf(NAME ": Total used clusters:   %lu\n", cfg->allocated_clusters);
         printf(NAME ": Bitmap size:           %lu\n", (unsigned long)
             div_round_up(cfg->bitmap_size, cfg->cluster_size));
@@ -251 +255 @@
         mbs->data_start_sector = host2uint32_t_le(cfg->data_start_sector);
 
-        mbs->data_clusters = host2uint32_t_le(cfg->total_clusters - 
-            div_round_up(cfg->data_start_sector * cfg->sector_size,
-            cfg->cluster_size));
+        mbs->data_clusters = host2uint32_t_le(cfg->total_clusters);
 
         mbs->rootdir_cluster = host2uint32_t_le(cfg->rootdir_cluster);
@@ -818 +820 @@
         cfg_print_info(&cfg);
 
+        if ((cfg.total_clusters - cfg.allocated_clusters) <= 2) {
+                printf(NAME ": Error, insufficient disk space on device.\n");
+                return 2;
+        }
+
         printf(NAME ": Writing the allocation table.\n");