Changeset d858a660 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2017-07-04T15:05:43Z (7 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9c2c7d2

Parents:

2456fd0

Message:

Fdisk should print volume labels.

File:

• uspace/app/fdisk/fdisk.c (modified) (3 diffs)

uspace/app/fdisk/fdisk.c

@@ -677 +677 @@
         char *svcname = NULL;
         char *spkind;
+        const char *label;
         int rc;
         int npart;
@@ -717 +718 @@
         fdisk_dev_get_flags(dev, &dflags);
 
-        printf("Device: %s, %s\n", sdcap, svcname);
+        printf("Device: %s (%s)\n", svcname, sdcap);
         free(sdcap);
         sdcap = NULL;
@@ -769 +770 @@
                 }
 
+                if (str_size(pinfo.label) > 0)
+                        label = pinfo.label;
+                else
+                        label = "(No label)";
+
                 if (linfo.ltype == lt_none)
-                        printf("Entire disk: %s", scap);
+                        printf("Entire disk: %s %s", label, scap);
                 else
-                        printf("Partition %d: %s", npart, scap);
+                        printf("Partition %d: %s %s", npart, label, scap);
 
                 if ((linfo.flags & lf_ext_supp) != 0) {