Changeset 9c2c7d2 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2017-07-06T15:52:15Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

5cd1eb9a

Parents:

d858a660

Message:

Fdisk should be able to set volume label for newly created partitions.

File:

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

uspace/app/fdisk/fdisk.c

@@ -42 +42 @@
 #include <fdisk.h>
 
+#define NO_LABEL_CAPTION "(No name)"
+
 static bool quit = false;
 static fdisk_t *fdisk;
@@ -445 +447 @@
         fdisk_cap_t cap;
         fdisk_cap_t mcap;
+        vol_label_supp_t vlsupp;
         vol_fstype_t fstype = 0;
         tinput_t *tinput = NULL;
@@ -450 +453 @@
         char *scap;
         char *smcap = NULL;
+        char *label = NULL;
 
         if (pkind == lpk_logical)
@@ -502 +506 @@
         }
 
+        fdisk_get_vollabel_support(dev, fstype, &vlsupp);
+        if (vlsupp.supported) {
+                tinput = tinput_new();
+                if (tinput == NULL) {
+                        rc = ENOMEM;
+                        goto error;
+                }
+
+                rc = tinput_set_prompt(tinput, "?> ");
+                if (rc != EOK)
+                        goto error;
+
+                /* Ask for volume label */
+                printf("Enter volume label for new partition.\n");
+                rc = tinput_read_i(tinput, "No name", &label);
+                if (rc != EOK)
+                        goto error;
+
+                tinput_destroy(tinput);
+                tinput = NULL;
+        }
+
         fdisk_pspec_init(&pspec);
         pspec.capacity = cap;
         pspec.pkind = pkind;
         pspec.fstype = fstype;
+        pspec.label = label;
 
         rc = fdisk_part_create(dev, &pspec, NULL);
@@ -513 +540 @@
         }
 
+        free(label);
         return EOK;
 error:
         free(smcap);
+        free(label);
         if (tinput != NULL)
                 tinput_destroy(tinput);
@@ -530 +559 @@
         char *sfstype = NULL;
         char *sdesc = NULL;
+        const char *label;
         bool confirm;
         void *sel;
@@ -577 +607 @@
                         }
 
-                        rc = asprintf(&sdesc, "%s, %s, %s", scap, spkind, sfstype);
+                        if (str_size(pinfo.label) > 0)
+                                label = pinfo.label;
+                        else
+                                label = "(No name)";
+
+                        rc = asprintf(&sdesc, "%s %s, %s, %s", label,
+                            scap, spkind, sfstype);
                         if (rc < 0) {
                                 rc = ENOMEM;
@@ -773 +809 @@
                         label = pinfo.label;
                 else
-                        label = "(No label)";
+                        label = "(No name)";
 
                 if (linfo.ltype == lt_none)