Changeset 0f22528 in mainline

Timestamp:

2012-02-28T21:57:27Z (13 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

ebea7acf

Parents:

9bbe54f

Message:

mkexfat: Be sure there is sufficient space to create the filesystem on device.

File:

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

uspace/app/mkexfat/mkexfat.c

@@ -144 +144 @@
 {
         unsigned long fat_bytes;
+        unsigned long fat_cls;
         aoff64_t const volume_bytes = (cfg->volume_count - FAT_SECTOR_START) *
             cfg->sector_size;
@@ -180 +181 @@
          * number of available clusters.
          */
-        cfg->total_clusters -= div_round_up((cfg->data_start_sector -
+        fat_cls = div_round_up((cfg->data_start_sector -
             FAT_SECTOR_START) * cfg->sector_size,
             cfg->cluster_size);
+        if (fat_cls >= cfg->total_clusters) {
+                /* Insufficient disk space on device */
+                cfg->total_clusters = 0;
+                return;
+        }
+        cfg->total_clusters -= fat_cls;
 
         /* Compute the bitmap size */
@@ -821 +828 @@
         cfg_print_info(&cfg);
 
-        if ((cfg.total_clusters - cfg.allocated_clusters) <= 2) {
+        if (cfg.total_clusters <= cfg.allocated_clusters + 2) {
                 printf(NAME ": Error, insufficient disk space on device.\n");
                 return 2;
@@ -897 +904 @@
         }
 
+        printf(NAME ": Writing the boot sectors.\n");
+
         rc = bootsec_write(service_id, &cfg);
         if (rc != EOK) {