Changeset d858a660 in mainline

Timestamp:

2017-07-04T15:05:43Z (8 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.

Location:

uspace

Files:

• app/fdisk/fdisk.c (modified) (3 diffs)
• lib/c/include/ipc/vol.h (modified) (1 diff)
• lib/c/include/types/vol.h (modified) (2 diffs)
• lib/fdisk/include/types/fdisk.h (modified) (2 diffs)
• lib/fdisk/src/fdisk.c (modified) (4 diffs)
• srv/volsrv/part.c (modified) (3 diffs)
• srv/volsrv/types/part.h (modified) (1 diff)

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) {

uspace/lib/c/include/ipc/vol.h

@@ -36 +36 @@
 #include <ipc/common.h>
 
+#define VOL_LABEL_MAXLEN 63
+
 typedef enum {
         VOL_GET_PARTS = IPC_FIRST_USER_METHOD,

uspace/lib/c/include/types/vol.h

@@ -37 +37 @@
 
 #include <async.h>
+#include <ipc/vol.h>
 
 typedef enum {
@@ -71 +72 @@
         /** Filesystem type */
         vol_fstype_t fstype;
+        /** Volume label */
+        char label[VOL_LABEL_MAXLEN + 1];
 } vol_part_info_t;
 

uspace/lib/fdisk/include/types/fdisk.h

@@ -187 +187 @@
         /** Service ID */
         service_id_t svc_id;
+        /** Volume label */
+        char *label;
 } fdisk_part_t;
 
@@ -209 +211 @@
         /** File system type */
         vol_fstype_t fstype;
+        /** Volume label */
+        char *label;
 } fdisk_part_info_t;
 

uspace/lib/fdisk/src/fdisk.c

@@ -269 +269 @@
                 part->pcnt = vpinfo.pcnt;
                 part->fstype = vpinfo.fstype;
+                part->label = str_dup(vpinfo.label);
         }
 
@@ -301 +302 @@
         return EOK;
 error:
+        if (part != NULL)
+                free(part->label);
         free(part);
         return rc;
@@ -315 +318 @@
         if (link_used(&part->llog_ba))
                 list_remove(&part->llog_ba);
+
+        free(part->label);
         free(part);
 }
@@ -667 +672 @@
         info->fstype = part->fstype;
         info->pkind = part->pkind;
+        info->label = part->label;
         return EOK;
 }

uspace/srv/volsrv/part.c

@@ -186 +186 @@
                 part->pcnt = vpc_fs;
                 part->fstype = fst->fstype;
+                part->label = str_dup(info.label);
+                if (part->label == NULL)
+                        goto error;
         } else {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Partition does not contain "
@@ -198 +201 @@
 
                 part->pcnt = empty ? vpc_empty : vpc_unknown;
+                part->label = str_dup("");
+                if (part->label == NULL)
+                        goto error;
         }
 
@@ -327 +333 @@
         pinfo->pcnt = part->pcnt;
         pinfo->fstype = part->fstype;
+        str_cpy(pinfo->label, sizeof(pinfo->label), part->label);
         return EOK;
 }

uspace/srv/volsrv/types/part.h

@@ -52 +52 @@
         /** Filesystem type */
         vol_fstype_t fstype;
+        /** Volume label */
+        char *label;
 } vol_part_t;