Signed-off-by: John Crispin <john@phrozen.org>
{
struct vfat_super_block *vs;
struct msdos_super_block *ms;
{
struct vfat_super_block *vs;
struct msdos_super_block *ms;
- const unsigned char *vol_label = 0;
+ unsigned char *vol_label = 0;
unsigned char *vol_serno = NULL, vol_label_buf[12] = { 0 };
uint16_t sector_size = 0, reserved;
uint32_t cluster_count, fat_size;
const char *version = NULL;
unsigned char *vol_serno = NULL, vol_label_buf[12] = { 0 };
uint16_t sector_size = 0, reserved;
uint32_t cluster_count, fat_size;
const char *version = NULL;
ms = blkid_probe_get_sb(pr, mag, struct msdos_super_block);
if (!ms)
ms = blkid_probe_get_sb(pr, mag, struct msdos_super_block);
if (!ms)
+ for (i = 10; i >= 0; i--) {
+ if (vol_label[i] != ' ')
+ break;
+ vol_label[i] = '\0';
+ }
+
if (vol_label && memcmp(vol_label, no_name, 11))
blkid_probe_set_label(pr, (unsigned char *) vol_label, 11);
if (vol_label && memcmp(vol_label, no_name, 11))
blkid_probe_set_label(pr, (unsigned char *) vol_label, 11);