Changeset 25828

Timestamp:

06/06/08 14:53:44 (6 months ago)

Author:

mmlr

Message:

* Unify reading the FAT volume label. One of two places didn't yet handle FAT32

volume labels at all.

* Use the common function in both identifying and mounting the volume so the

name is in sync between what the disk device manager got through scanning and
what Tracker gets through reading the fs stat.

* Strip trailing spaces from volume names in all places.

Files:

• haiku/trunk/src/add-ons/kernel/file_systems/fat/dosfs.c (modified) (16 diffs)

haiku/trunk/src/add-ons/kernel/file_systems/fat/dosfs.c

@@ -147 +147 @@
 
 
+static void
+dosfs_trim_spaces(char *label)
+{
+        uint8 index;
+        for (index = 10; index > 0; index--) {
+                if (label[index] == ' ')
+                        label[index] = 0;
+                else
+                        break;
+        }
+}
+
+static bool
+dosfs_read_label(bool fat32, uint8 *buffer, char *label)
+{
+        uint8 check = fat32 ? 0x42 : 0x29;
+        uint8 offset = fat32 ? 0x47 : 0x2b;
+
+        if (buffer[check] == 0x29
+                && memcmp(buffer + offset, "           ", 11) != 0) {
+                memcpy(label, buffer + offset, 11);
+                dosfs_trim_spaces(label);
+                return true;
+        }
+
+        return false;
+}
+
+
 static int
 lock_removable_device(int fd, bool state)
@@ -284 +313 @@
 
         vol->vol_entry = -2;    // for now, assume there is no volume entry
-        memset(vol->vol_label, ' ', 11);
+        strcpy(vol->vol_label, "no name");
 
         // now become more discerning citizens
@@ -312 +341 @@
                         goto error;
                 }
+
+                if (dosfs_read_label(true, buf, vol->vol_label))
+                        vol->vol_entry = -1;
         } else {
                 // fat12 & fat16
@@ -352 +384 @@
                 }
 
-
-                if (buf[0x26] == 0x29) {
-                        // fill in the volume label
-                        if (memcmp(buf+0x2b, "           ", 11)) {
-                                memcpy(vol->vol_label, buf+0x2b, 11);
-                                vol->vol_entry = -1;
-                        }
-                }
-
                 vol->fat_mirrored = true;
                 vol->active_fat = 0;
@@ -379 +402 @@
                 else
                         vol->fat_bits = 12;
+
+                if (dosfs_read_label(false, buf, vol->vol_label))
+                        vol->vol_entry = -1;
         }
 
@@ -529 +555 @@
                                 vol->vol_entry = diri.current_index;
                                 memcpy(vol->vol_label, buffer, 11);
+                                dosfs_trim_spaces(vol->vol_label);
                                 break;
                         }
@@ -536 +563 @@
 
         DPRINTF(0, ("root vnode id = %Lx\n", vol->root_vnode.vnid));
-        DPRINTF(0, ("volume label [%11.11s] (%lx)\n", vol->vol_label, vol->vol_entry));
+        DPRINTF(0, ("volume label [%s] (%lx)\n", vol->vol_label, vol->vol_entry));
 
         // steal a trick from bfs
@@ -623 +650 @@
         }
 
-        strcpy(name, "no name    ");
+        strcpy(name, "no name");
         sectors_per_fat = read16(buf,0x16);
         if (sectors_per_fat == 0) {
                 total_sectors = read32(buf,0x20);
-
-                if (buf[0x42] == 0x29) {
-                        // fill in FAT32 volume label
-                        if (memcmp(buf + 0x47, "           ", 11) != 0)
-                                memcpy(name, buf + 0x47, 11);
-                }
+                dosfs_read_label(true, buf, name);
         } else {
                 total_sectors = read16(buf,0x13); // partition size
@@ -638 +660 @@
                         total_sectors = read32(buf,0x20);
 
-                if (buf[0x26] == 0x29) {
-                        // fill in the volume label
-                        if (memcmp(buf + 0x2b, "           ", 11) != 0)
-                                memcpy(name, buf + 0x2b, 11);
-                }
+                dosfs_read_label(false, buf, name);
         }
 
@@ -925 +943 @@
                 strncpy(fss->volume_name, vol->vol_label, sizeof(fss->volume_name));
         else
-                strcpy(fss->volume_name, "no name    ");
+                strcpy(fss->volume_name, "no name");
 
         // XXX: should sanitize name as well
@@ -997 +1015 @@
                                 goto bi;
                         }
-                        if ((buffer[0x26] != 0x29) || memcmp(buffer + 0x2b, vol->vol_label, 11)) {
+                        if ((vol->sectors_per_fat == 0 && (buffer[0x42] != 0x29
+                                || strncmp(buffer + 0x47, vol->vol_label, 11) != 0))
+                                || (vol->sectors_per_fat != 0 && (buffer[0x26] != 0x29
+                                || strncmp(buffer + 0x2b, vol->vol_label, 11) != 0))) {
                                 dprintf("dosfs_wfsstat: label mismatch\n");
                                 block_cache_set_dirty(vol->fBlockCache, 0, false, tid);
@@ -1003 +1024 @@
                         } else {
                                 memcpy(buffer + 0x2b, name, 11);
-                                result = 0;
+                                result = B_OK;
                         }
                         block_cache_put(vol->fBlockCache, 0);
@@ -1013 +1034 @@
 
                         // check if it is the same as the old volume label
-                        if ((buffer == NULL) || (memcmp(buffer, vol->vol_label, 11))) {
+                        if ((buffer == NULL) || (strncmp(buffer, vol->vol_label, 11))) {
                                 dprintf("dosfs_wfsstat: label mismatch\n");
                                 diri_free(&diri);
@@ -1022 +1043 @@
                         diri_mark_dirty(&diri);
                         diri_free(&diri);
-                        result = 0;
+                        result = B_OK;
                 } else {
                         uint32 index;
@@ -1029 +1050 @@
                 }
 
-                if (result == 0)
+                if (result == B_OK) {
                         memcpy(vol->vol_label, name, 11);
+                        dosfs_trim_spaces(vol->vol_label);
+                }
         }
 
@@ -1084 +1107 @@
                         dprintf("last allocated cluster = %lx\n", vol->last_allocated);
                         dprintf("root vnode id = %Lx\n", vol->root_vnode.vnid);
-                        dprintf("volume label [%11.11s]\n", vol->vol_label);
+                        dprintf("volume label [%s]\n", vol->vol_label);
                         break;