Changeset 4b6635a7 in mainline for uspace/app/fdisk/fdisk.c

Timestamp:

2015-10-12T15:42:23Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

edebb4a1

Parents:

6a0db524

Message:

Volsrv empty partition detection.

File:

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

uspace/app/fdisk/fdisk.c

@@ -262 +262 @@
 }
 
-static int fdsk_select_fstype(fdisk_fstype_t *fstype)
+static int fdsk_select_fstype(vol_fstype_t *fstype)
 {
         nchoice_t *choice = NULL;
@@ -284 +284 @@
         }
 
-        for (i = FDFS_CREATE_LO; i < FDFS_CREATE_HI; i++) {
+        for (i = 0; i < VOL_FSTYPE_LIMIT; i++) {
                 rc = fdisk_fstype_format(i, &sfstype);
                 if (rc != EOK)
@@ -307 +307 @@
 
         nchoice_destroy(choice);
-        *fstype = (fdisk_fstype_t)sel;
+        *fstype = (vol_fstype_t)sel;
         return EOK;
 error:
@@ -321 +321 @@
         fdisk_part_spec_t pspec;
         fdisk_cap_t cap;
-        fdisk_fstype_t fstype = fdfs_none;
+        vol_fstype_t fstype = 0;
         tinput_t *tinput = NULL;
         char *scap;
@@ -577 +577 @@
                 }
 
-                if (pinfo.pkind != lpk_extended)
-                        printf(", %s", sfstype);
+                if (pinfo.pkind != lpk_extended) {
+                        switch (pinfo.pcnt) {
+                        case vpc_empty:
+                                printf(", Empty");
+                                break;
+                        case vpc_fs:
+                                printf(", %s", sfstype);
+                                break;
+                        case vpc_unknown:
+                                printf(", Unknown");
+                                break;
+                        }
+                }
+
                 printf("\n");