[VFATLIB] Never touch the file system if not in interactive or RW mode.

[reactos.git] / sdk / lib / fslib / vfatlib / check / fat.c

diff --git a/sdk/lib/fslib/vfatlib/check/fat.c b/sdk/lib/fslib/vfatlib/check/fat.c
index 87c7fa5..a601e6a 100644 (file)
--- a/sdk/lib/fslib/vfatlib/check/fat.c
+++ b/sdk/lib/fslib/vfatlib/check/fat.c
@@ -350,7 +350,7 @@ void reclaim_free(DOS_FS * fs)
        get_fat(&curEntry, fs->fat, i, fs);
 
        if (!get_owner(fs, i) && curEntry.value &&
-           !FAT_IS_BAD(fs, curEntry.value)) {
+           !FAT_IS_BAD(fs, curEntry.value) && rw) {
            set_fat(fs, i, 0);
            reclaimed++;
        }
@@ -490,30 +490,32 @@ void reclaim_file(DOS_FS * fs)
     }
     while (changed);
 
-    /* Now we can start recovery */
-    files = reclaimed = 0;
-    for (i = 2; i < total_num_clusters; i++)
-       /* If this cluster is the head of an orphan chain... */
-       if (get_owner(fs, i) == &orphan && !num_refs[i]) {
-           DIR_ENT de;
-           off_t offset;
-           files++;
-           offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC");
-           de.start = htole16(i & 0xffff);
-           if (fs->fat_bits == 32)
-               de.starthi = htole16(i >> 16);
-           for (walk = i; walk > 0 && walk != -1;
-                walk = next_cluster(fs, walk)) {
-               de.size = htole32(le32toh(de.size) + fs->cluster_size);
-               reclaimed++;
+    if (rw) {
+        /* Now we can start recovery */
+        files = reclaimed = 0;
+        for (i = 2; i < total_num_clusters; i++)
+           /* If this cluster is the head of an orphan chain... */
+           if (get_owner(fs, i) == &orphan && !num_refs[i]) {
+               DIR_ENT de;
+               off_t offset;
+               files++;
+               offset = alloc_rootdir_entry(fs, &de, "FSCK%04dREC");
+               de.start = htole16(i & 0xffff);
+               if (fs->fat_bits == 32)
+                   de.starthi = htole16(i >> 16);
+               for (walk = i; walk > 0 && walk != -1;
+                    walk = next_cluster(fs, walk)) {
+                   de.size = htole32(le32toh(de.size) + fs->cluster_size);
+                   reclaimed++;
+               }
+               fs_write(offset, sizeof(DIR_ENT), &de);
            }
-           fs_write(offset, sizeof(DIR_ENT), &de);
-       }
-    if (reclaimed)
-       printf("Reclaimed %d unused cluster%s (%llu bytes) in %d chain%s.\n",
-              reclaimed, reclaimed == 1 ? "" : "s",
-              (unsigned long long)reclaimed * fs->cluster_size, files,
-              files == 1 ? "" : "s");
+        if (reclaimed)
+           printf("Reclaimed %d unused cluster%s (%llu bytes) in %d chain%s.\n",
+                  reclaimed, reclaimed == 1 ? "" : "s",
+                  (unsigned long long)reclaimed * fs->cluster_size, files,
+                  files == 1 ? "" : "s");
+    }
 
     free(num_refs);
 }
@@ -543,9 +545,9 @@ uint32_t update_free(DOS_FS * fs)
                   (long)fs->free_clusters, (long)free);
            if (interactive)
                printf("1) Correct\n2) Don't correct\n");
-           else
+           else if (rw)
                printf("  Auto-correcting.\n");
-           if (!interactive || get_key("12", "?") == '1')
+           if ((!interactive && rw) || (interactive && get_key("12", "?") == '1'))
                do_set = 1;
        }
     } else {