Changeset ea0ff6b in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2015-10-15T20:43:30Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

44fe800

Parents:

edebb4a1

Message:

Disk erasure.

File:

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

uspace/app/fdisk/fdisk.c

@@ -51 +51 @@
         /** Delete label */
         devac_delete_label,
+        /** Erase disk */
+        devac_erase_disk,
         /** Create (primary) partition */
         devac_create_pri_part,
@@ -262 +264 @@
 }
 
+static int fdsk_erase_disk(fdisk_dev_t *dev)
+{
+        int rc;
+
+        rc = fdisk_dev_erase(dev);
+        if (rc != EOK) {
+                printf("Error erasing disk.\n");
+                return rc;
+        }
+
+        return EOK;
+}
+
 static int fdsk_select_fstype(vol_fstype_t *fstype)
 {
@@ -473 +488 @@
         fdisk_part_info_t pinfo;
         fdisk_cap_t cap;
+        fdisk_dev_flags_t dflags;
         char *sltype = NULL;
         char *sdcap = NULL;
@@ -514 +530 @@
                 goto error;
         }
+
+        fdisk_dev_get_flags(dev, &dflags);
 
         printf("Device: %s, %s\n", sdcap, svcname);
@@ -667 +685 @@
         }
 
-        if (linfo.ltype == lt_none) {
+        if ((dflags & fdf_can_create_label) != 0) {
                 rc = nchoice_add(choice, "Create label",
                     (void *)devac_create_label);
@@ -675 +693 @@
                         goto error;
                 }
-        } else {
+        }
+
+        if ((dflags & fdf_can_delete_label) != 0) {
                 rc = nchoice_add(choice, "Delete label",
                     (void *)devac_delete_label);
+                if (rc != EOK) {
+                        assert(rc == ENOMEM);
+                        printf("Out of memory.\n");
+                        goto error;
+                }
+        }
+
+        if ((dflags & fdf_can_erase_dev) != 0) {
+                rc = nchoice_add(choice, "Erase disk",
+                    (void *)devac_erase_disk);
                 if (rc != EOK) {
                         assert(rc == ENOMEM);
@@ -704 +734 @@
         case devac_delete_label:
                 (void) fdsk_delete_label(dev);
+                break;
+        case devac_erase_disk:
+                (void) fdsk_erase_disk(dev);
                 break;
         case devac_create_pri_part: