Changeset 22fb7ab in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2015-06-26T16:15:31Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

28ed0d9

Parents:

1356f85a

Message:

Delegate disks to volsrv and labels to vbd.

File:

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

uspace/app/fdisk/fdisk.c

@@ -43 +43 @@
 
 static bool quit = false;
+static fdisk_t *fdisk;
 
 /** Device menu actions */
@@ -88 +89 @@
         }
 
-        rc = fdisk_dev_list_get(&devlist);
+        rc = fdisk_dev_list_get(fdisk, &devlist);
         if (rc != EOK) {
                 printf("Error getting device list.\n");
@@ -207 +208 @@
         }
 
-        for (i = FDL_CREATE_LO; i < FDL_CREATE_HI; i++) {
+        for (i = 0; i < LT_LIMIT; i++) {
                 rc = fdisk_ltype_format(i, &sltype);
                 if (rc != EOK)
@@ -229 +230 @@
         }
 
-        rc = fdisk_label_create(dev, (fdisk_label_type_t)sel);
+        rc = fdisk_label_create(dev, (label_type_t)sel);
         if (rc != EOK) {
                 printf("Error creating label.\n");
@@ -505 +506 @@
         }
 
-        rc = fdisk_label_get_info(dev, &linfo);
-        if (rc != EOK) {
-                printf("Error getting label information.\n");
-                goto error;
-        }
-
-        rc = fdisk_ltype_format(linfo.ltype, &sltype);
-        if (rc != EOK) {
-                assert(rc == ENOMEM);
-                printf("Out of memory.\n");
-                goto error;
-        }
-
         printf("Device: %s, %s\n", sdcap, svcname);
-        printf("Label type: %s\n", sltype);
-        free(sltype);
-        sltype = NULL;
         free(sdcap);
         sdcap = NULL;
+
+        rc = fdisk_label_get_info(dev, &linfo);
+        if (rc != EOK) {
+                printf("Error getting label information.\n");
+                goto error;
+        }
+
+        switch (linfo.dcnt) {
+        case dc_empty:
+                printf("Disk is empty.\n");
+                break;
+        case dc_label:
+                rc = fdisk_ltype_format(linfo.ltype, &sltype);
+                if (rc != EOK) {
+                        assert(rc == ENOMEM);
+                        printf("Out of memory.\n");
+                        goto error;
+                }
+
+                printf("Label type: %s\n", sltype);
+                free(sltype);
+                sltype = NULL;
+                break;
+        case dc_fs:
+                printf("Disk contains a file system.\n");
+                break;
+        case dc_unknown:
+                printf("Disk contains unknown data.\n");
+                break;
+        }
 
         part = fdisk_part_first(dev);
@@ -563 +578 @@
         }
 
-        if (linfo.ltype != fdl_none) {
+        if (linfo.dcnt == dc_label) {
                 rc = nchoice_add(choice, "Create partition",
                     (void *)devac_create_part);
@@ -583 +598 @@
         }
 
-        if (linfo.ltype == fdl_none) {
+        if (linfo.dcnt == dc_empty) {
                 rc = nchoice_add(choice, "Create label",
                     (void *)devac_create_label);
@@ -616 +631 @@
         switch ((devac_t)sel) {
         case devac_create_label:
-                rc = fdsk_create_label(dev);
-                if (rc != EOK)
-                        goto error;
+                (void) fdsk_create_label(dev);
                 break;
         case devac_delete_label:
-                rc = fdsk_delete_label(dev);
-                if (rc != EOK)
-                        goto error;
+                (void) fdsk_delete_label(dev);
                 break;
         case devac_create_part:
-                rc = fdsk_create_part(dev);
-                if (rc != EOK)
-                        goto error;
+                (void) fdsk_create_part(dev);
                 break;
         case devac_delete_part:
-                rc = fdsk_delete_part(dev);
-                if (rc != EOK)
-                        goto error;
+                (void) fdsk_delete_part(dev);
                 break;
         case devac_exit:
@@ -658 +665 @@
         int rc;
 
+        rc = fdisk_create(&fdisk);
+        if (rc != EOK) {
+                printf("Error initializing Fdisk.\n");
+                return 1;
+        }
+
         rc = fdsk_dev_sel_choice(&svcid);
         if (rc != EOK)
@@ -665 +678 @@
                 return 0;
 
-        rc = fdisk_dev_open(svcid, &dev);
+        rc = fdisk_dev_open(fdisk, svcid, &dev);
         if (rc != EOK) {
                 printf("Error opening device.\n");
@@ -680 +693 @@
 
         fdisk_dev_close(dev);
+        fdisk_destroy(fdisk);
 
         return 0;