Ticket #4602: dosfs_volume_name2.diff

util.c

@@ -164 +164 @@
         c = (c << 7) + (c >> 1) + *(p++);
     return c;
 }
+
+
+void sanatize_name(char *name, int length)
+{
+    int i;
+
+    // XXX: should sanitize name as well
+    for (i = length - 1; i > 0; i--)
+        if (name[i] != ' ')
+            break;
+    name[i + 1] = 0;
+    for (; i >= 0; i--) {
+        if ((name[i] >= 'A') && (name[i] <= 'Z'))
+            name[i] += 'a' - 'A';
+    }
+
+}

dosfs.c

@@ -765 +765 @@
 
     cookie->bytes_per_sector = bytes_per_sector;
     cookie->total_sectors = total_sectors;
+    sanatize_name(name, 12);
     strlcpy(cookie->name, name, 12);
     *_cookie = cookie;
 
@@ -994 +995 @@
 dosfs_read_fs_stat(fs_volume *_vol, struct fs_info * fss)
 {
     nspace* vol = (nspace*)_vol->private_volume;
-    int i;
 
     LOCK_VOL(vol);
 
@@ -1021 +1021 @@
     strncpy(fss->device_name, vol->device, sizeof(fss->device_name));
 
     if (vol->vol_entry > -2)
-        strncpy(fss->volume_name, vol->vol_label, sizeof(fss->volume_name));
+        strlcpy(fss->volume_name, vol->vol_label, sizeof(fss->volume_name));
     else
         strcpy(fss->volume_name, "no name");
 
-    // XXX: should sanitize name as well
-    for (i=10;i>0;i--)
-        if (fss->volume_name[i] != ' ')
-            break;
-    fss->volume_name[i+1] = 0;
-    for (;i>=0;i--) {
-        if ((fss->volume_name[i] >= 'A') && (fss->volume_name[i] <= 'Z'))
-            fss->volume_name[i] += 'a' - 'A';
-    }
+    sanatize_name(fss->volume_name, 11);
 
     // File system name
     strcpy(fss->fsh_name, "fat");

util.h

@@ -25 +25 @@
 uint32  time_t2dos(time_t s);
 
 uint8   hash_msdos_name(const char *name);
+void sanatize_name(char *name, int length);
 
 #if 0
 #define read32(buffer,off) \