aboutsummaryrefslogtreecommitdiff
path: root/toys
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2016-03-20 11:13:22 -0700
committerRob Landley <rob@landley.net>2016-03-22 13:16:44 -0500
commitc23186d3ee6001b78c843fc3609575306c687ba2 (patch)
tree41cdd2c7cdd63178c2d8f69b6fc7a085a12fddf4 /toys
parent6aba814b28cddd45c7301c39dccd65b316eb5c82 (diff)
downloadtoybox-c23186d3ee6001b78c843fc3609575306c687ba2.tar.gz
blkid: Handle short/empty vfat labels; update tests
vfat labels have a fixed space allocated for them. In the case of a shorter label, the remaining bytes are padded with spaces. A vfat filesystem with no label (i.e. that will show up in Windows as "Local Disk (X:)" or "Removable Disk (X:)") is stored as "NO NAME ". Both of these changes match behavior from util-linux.
Diffstat (limited to 'toys')
-rw-r--r--toys/other/blkid.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/toys/other/blkid.c b/toys/other/blkid.c
index 2880812a..c701c800 100644
--- a/toys/other/blkid.c
+++ b/toys/other/blkid.c
@@ -115,9 +115,17 @@ static void do_blkid(int fd, char *name)
// output for blkid
printf("%s:",name);
- if (fstypes[i].label_len)
- printf(" LABEL=\"%.*s\"", fstypes[i].label_len,
- toybuf+fstypes[i].label_off-off);
+ if (fstypes[i].label_len) {
+ int label_len = fstypes[i].label_len, loff = fstypes[i].label_off-off;
+ if (!strcmp(fstypes[i].name, "vfat")) {
+ if (!strncmp(toybuf+loff, "NO NAME ", label_len))
+ label_len=0;
+ else while (toybuf[loff+label_len-1] == ' ')
+ label_len--;
+ }
+ if (label_len)
+ printf(" LABEL=\"%.*s\"", label_len, toybuf+loff);
+ }
if (fstypes[i].uuid_off) {
int bits = 0x550, size = fstypes[i].uuid_off >> 24,