Changeset d858a660 in mainline for uspace/lib/fdisk

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/lib/fdisk

Files:

• include/types/fdisk.h (modified) (2 diffs)
• src/fdisk.c (modified) (4 diffs)

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;
 }