Browse Source

strip trailing spaces from vfat labels

Signed-off-by: John Crispin <john@phrozen.org>
John Crispin 6 years ago
parent
commit
3d239815bb
1 changed files with 8 additions and 1 deletions
  1. 8 1
      libblkid-tiny/vfat.c

+ 8 - 1
libblkid-tiny/vfat.c

@@ -302,11 +302,12 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
 {
 	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;
+	int i;
 
 	ms = blkid_probe_get_sb(pr, mag, struct msdos_super_block);
 	if (!ms)
@@ -418,6 +419,12 @@ static int probe_vfat(blkid_probe pr, const struct blkid_idmag *mag)
 		}
 	}
 
+	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);