search for: 4ee1a40

...s_get_label (mountable->device); + if (STREQ (type, "ntfs") && optgroup_ntfsprogs_available ()) + return ntfs_get_label (mountable->device); } return get_blkid_tag (mountable->device, "LABEL"); diff --git a/daemon/daemon.h b/daemon/daemon.h index 4ee1a40..9405ce6 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -265,6 +265,9 @@ extern char *debug_bmap_device (const char *subcmd, size_t argc, char *const *co /*-- in btrfs.c --*/ extern char *btrfs_get_label (const char *device); +/*-- in ntfs.c --*/ +extern char *ntfs_get_label (const char...

blkid(1) (or actually, libblkid) seems to handle file system labels up to 127 characters. Considering that btrfs labels can be up to 255 characters, this means long labels are not read correctly (i.e. get truncated) by blkid. Get the file system type, and if btrfs is available invoke `btrfs filesystem` to get the label of btrfs file systems. --- daemon/blkid.c | 6 ++++++ daemon/btrfs.c | 24

...if (len > 0 && out[len-1] == '\n') + out[len-1] = '\0'; + + return out; +} + /* Takes optional arguments, consult optargs_bitmask. */ int do_btrfs_filesystem_resize (const char *filesystem, int64_t size) diff --git a/daemon/daemon.h b/daemon/daemon.h index c101c3b..4ee1a40 100644 --- a/daemon/daemon.h +++ b/daemon/daemon.h @@ -262,6 +262,9 @@ extern char *debug_bmap (const char *subcmd, size_t argc, char *const *const arg extern char *debug_bmap_file (const char *subcmd, size_t argc, char *const *const argv); extern char *debug_bmap_device (const char *subcmd, size...