Changeset 21f1543 in mainline

Timestamp:

2015-10-21T10:09:01Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ef9dac04

Parents:

852664b9

Message:

Improve partition deletion menu.

File:

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

uspace/app/fdisk/fdisk.c

@@ -419 +419 @@
         fdisk_part_info_t pinfo;
         char *scap = NULL;
+        char *spkind = NULL;
         char *sfstype = NULL;
         char *sdesc = NULL;
@@ -452 +453 @@
                 }
 
-                rc = fdisk_fstype_format(pinfo.fstype, &sfstype);
-                if (rc != EOK) {
-                        printf("Out of memory.\n");
-                        goto error;
-                }
-
-                rc = asprintf(&sdesc, "%s, %s", scap, sfstype);
-                if (rc < 0) {
-                        rc = ENOMEM;
-                        goto error;
+                rc = fdisk_pkind_format(pinfo.pkind, &spkind);
+                if (rc != EOK) {
+                        printf("\nOut of memory.\n");
+                        goto error;
+                }
+
+                if (pinfo.pkind != lpk_extended) {
+                        rc = fdisk_fstype_format(pinfo.fstype, &sfstype);
+                        if (rc != EOK) {
+                                printf("Out of memory.\n");
+                                goto error;
+                        }
+
+                        rc = asprintf(&sdesc, "%s, %s, %s", scap, spkind, sfstype);
+                        if (rc < 0) {
+                                rc = ENOMEM;
+                                goto error;
+                        }
+
+                } else {
+                        rc = asprintf(&sdesc, "%s, %s", scap, spkind);
+                        if (rc < 0) {
+                                rc = ENOMEM;
+                                goto error;
+                        }
                 }
 
@@ -473 +489 @@
                 free(scap);
                 scap = NULL;
+                free(spkind);
+                spkind = NULL;
                 free(sfstype);
                 sfstype = NULL;
@@ -481 +499 @@
         }
 
+        rc = nchoice_add(choice, "Cancel", NULL, 0);
+        if (rc != EOK) {
+                assert(rc == ENOMEM);
+                printf("Out of memory.\n");
+                goto error;
+        }
+
         rc = nchoice_get(choice, &sel);
         if (rc != EOK) {
@@ -487 +512 @@
         }
 
-        rc = fdisk_part_destroy((fdisk_part_t *)sel);
-        if (rc != EOK) {
-                printf("Error deleting partition.\n");
-                return rc;
+        if (sel != NULL) {
+                rc = fdisk_part_destroy((fdisk_part_t *)sel);
+                if (rc != EOK) {
+                        printf("Error deleting partition.\n");
+                        return rc;
+                }
         }
 
@@ -497 +524 @@
 error:
         free(scap);
+        free(spkind);
         free(sfstype);
         free(sdesc);