aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util-linux/volume_id/get_devname.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 230102d89..665cb9b6e 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -49,7 +49,11 @@ get_label_uuid(int fd, char **label, char **uuid, const char **type)
49 if (volume_id_probe_all(vid, /*0,*/ size) != 0) 49 if (volume_id_probe_all(vid, /*0,*/ size) != 0)
50 goto ret; 50 goto ret;
51 51
52 if (vid->label[0] != '\0' || vid->uuid[0] != '\0') { 52 if (vid->label[0] != '\0' || vid->uuid[0] != '\0'
53#if ENABLE_FEATURE_BLKID_TYPE
54 || vid->type != NULL
55#endif
56 ) {
53 *label = xstrndup(vid->label, sizeof(vid->label)); 57 *label = xstrndup(vid->label, sizeof(vid->label));
54 *uuid = xstrndup(vid->uuid, sizeof(vid->uuid)); 58 *uuid = xstrndup(vid->uuid, sizeof(vid->uuid));
55#if ENABLE_FEATURE_BLKID_TYPE 59#if ENABLE_FEATURE_BLKID_TYPE