Changes in uspace/app/fdisk/fdisk.c [4627314:6c4eedf] in mainline

File:

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

uspace/app/fdisk/fdisk.c

@@ -35 +35 @@
  */
 
+#include <cap.h>
 #include <errno.h>
 #include <nchoice.h>
@@ -41 +42 @@
 #include <stdlib.h>
 #include <fdisk.h>
+
+#define NO_LABEL_CAPTION "(No name)"
 
 static bool quit = false;
@@ -149 +152 @@
         nchoice_t *choice = NULL;
         char *svcname = NULL;
-        fdisk_cap_t cap;
+        cap_spec_t cap;
         fdisk_dev_info_t *sdev;
         char *scap = NULL;
@@ -198 +201 @@
                 }
 
-                fdisk_cap_simplify(&cap);
-
-                rc = fdisk_cap_format(&cap, &scap);
+                cap_simplify(&cap);
+
+                rc = cap_format(&cap, &scap);
                 if (rc != EOK) {
                         assert(rc == ENOMEM);
@@ -443 +446 @@
         int rc;
         fdisk_part_spec_t pspec;
-        fdisk_cap_t cap;
-        fdisk_cap_t mcap;
+        cap_spec_t cap;
+        cap_spec_t mcap;
+        vol_label_supp_t vlsupp;
         vol_fstype_t fstype = 0;
         tinput_t *tinput = NULL;
@@ -450 +454 @@
         char *scap;
         char *smcap = NULL;
+        char *label = NULL;
 
         if (pkind == lpk_logical)
@@ -462 +467 @@
         }
 
-        fdisk_cap_simplify(&mcap);
-
-        rc = fdisk_cap_format(&mcap, &smcap);
+        cap_simplify(&mcap);
+
+        rc = cap_format(&mcap, &smcap);
         if (rc != EOK) {
                 rc = ENOMEM;
@@ -486 +491 @@
                         goto error;
 
-                rc = fdisk_cap_parse(scap, &cap);
+                rc = cap_parse(scap, &cap);
                 if (rc == EOK)
                         break;
@@ -502 +507 @@
         }
 
+        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, "New volume", &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 +541 @@
         }
 
+        free(label);
         return EOK;
 error:
         free(smcap);
+        free(label);
         if (tinput != NULL)
                 tinput_destroy(tinput);
@@ -530 +560 @@
         char *sfstype = NULL;
         char *sdesc = NULL;
+        const char *label;
         bool confirm;
         void *sel;
@@ -556 +587 @@
                 }
 
-                fdisk_cap_simplify(&pinfo.capacity);
-
-                rc = fdisk_cap_format(&pinfo.capacity, &scap);
+                cap_simplify(&pinfo.capacity);
+
+                rc = cap_format(&pinfo.capacity, &scap);
                 if (rc != EOK) {
                         printf("Out of memory.\n");
@@ -577 +608 @@
                         }
 
-                        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;
@@ -667 +704 @@
         fdisk_part_t *part;
         fdisk_part_info_t pinfo;
-        fdisk_cap_t cap;
-        fdisk_cap_t mcap;
+        cap_spec_t cap;
+        cap_spec_t mcap;
         fdisk_dev_flags_t dflags;
         char *sltype = NULL;
@@ -677 +714 @@
         char *svcname = NULL;
         char *spkind;
+        const char *label;
         int rc;
         int npart;
@@ -701 +739 @@
         }
 
-        fdisk_cap_simplify(&cap);
-
-        rc = fdisk_cap_format(&cap, &sdcap);
+        cap_simplify(&cap);
+
+        rc = cap_format(&cap, &sdcap);
         if (rc != EOK) {
                 printf("Out of memory.\n");
@@ -717 +755 @@
         fdisk_dev_get_flags(dev, &dflags);
 
-        printf("Device: %s, %s\n", sdcap, svcname);
+        printf("Device: %s (%s)\n", svcname, sdcap);
         free(sdcap);
         sdcap = NULL;
@@ -755 +793 @@
                 }
 
-                fdisk_cap_simplify(&pinfo.capacity);
-
-                rc = fdisk_cap_format(&pinfo.capacity, &scap);
+                cap_simplify(&pinfo.capacity);
+
+                rc = cap_format(&pinfo.capacity, &scap);
                 if (rc != EOK) {
                         printf("Out of memory.\n");
@@ -769 +807 @@
                 }
 
+                if (str_size(pinfo.label) > 0)
+                        label = pinfo.label;
+                else
+                        label = "(No name)";
+
                 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) {
@@ -807 +850 @@
                 }
 
-                fdisk_cap_simplify(&mcap);
-
-                rc = fdisk_cap_format(&mcap, &smcap);
+                cap_simplify(&mcap);
+
+                rc = cap_format(&mcap, &smcap);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -829 +872 @@
                 }
 
-                fdisk_cap_simplify(&mcap);
-
-                rc = fdisk_cap_format(&mcap, &smcap);
+                cap_simplify(&mcap);
+
+                rc = cap_format(&mcap, &smcap);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -854 +897 @@
                 }
 
-                fdisk_cap_simplify(&mcap);
-
-                rc = fdisk_cap_format(&mcap, &smcap);
+                cap_simplify(&mcap);
+
+                rc = cap_format(&mcap, &smcap);
                 if (rc != EOK) {
                         rc = ENOMEM;
@@ -872 +915 @@
                 }
 
-                fdisk_cap_simplify(&mcap);
-
-                rc = fdisk_cap_format(&mcap, &smcap);
+                cap_simplify(&mcap);
+
+                rc = cap_format(&mcap, &smcap);
                 if (rc != EOK) {
                         rc = ENOMEM;