Changeset d858a660 in mainline for uspace/srv

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/srv/volsrv

Files:

• part.c (modified) (3 diffs)
• types/part.h (modified) (1 diff)

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;