Changeset 2dab624 in mainline

Timestamp:

2015-10-31T20:24:27Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

9624c35

Parents:

dc2d582

Message:

Fix parsing capacity without decimal separator as zero. Fix non-fs partition content display when selecting partition to delete. Fix capacity of new partition. Fix getting partition content, from volsrv.

Location:

uspace

Files:

• app/fdisk/fdisk.c (modified) (4 diffs)
• lib/fdisk/src/cap.c (modified) (1 diff)
• lib/fdisk/src/fdisk.c (modified) (1 diff)
• srv/volsrv/volsrv.c (modified) (1 diff)

uspace/app/fdisk/fdisk.c

@@ -65 +65 @@
 } devac_t;
 
+static int fdsk_pcnt_fs_format(vol_part_cnt_t pcnt, vol_fstype_t fstype,
+    char **rstr)
+{
+        int rc;
+        char *s;
+
+        switch (pcnt) {
+        case vpc_empty:
+                s = str_dup("Empty");
+                if (s == NULL)
+                        return ENOMEM;
+                break;
+        case vpc_fs:
+                rc = fdisk_fstype_format(fstype, &s);
+                if (rc != EOK)
+                        return ENOMEM;
+                break;
+        case vpc_unknown:
+                s = str_dup("Unknown");
+                if (s == NULL)
+                        return ENOMEM;
+                break;
+        }
+
+        *rstr = s;
+        return EOK;
+}
+
 /** Confirm user selection. */
 static int fdsk_confirm(const char *msg, bool *rconfirm)
@@ -538 +566 @@
 
                 if (pinfo.pkind != lpk_extended) {
-                        rc = fdisk_fstype_format(pinfo.fstype, &sfstype);
+                        rc = fdsk_pcnt_fs_format(pinfo.pcnt, pinfo.fstype, &sfstype);
                         if (rc != EOK) {
                                 printf("Out of memory.\n");
@@ -730 +758 @@
                 }
 
-                rc = fdisk_fstype_format(pinfo.fstype, &sfstype);
+                rc = fdsk_pcnt_fs_format(pinfo.pcnt, pinfo.fstype, &sfstype);
                 if (rc != EOK) {
                         printf("Out of memory.\n");
@@ -753 +781 @@
 
                 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(", %s", sfstype);
                 }
 

uspace/lib/fdisk/src/cap.c

@@ -255 +255 @@
                 }
         } else {
-                m = 0; dp = 0;
+                dp = 0;
         }
 

uspace/lib/fdisk/src/fdisk.c

@@ -790 +790 @@
                         return EIO;
                 }
-        }
-
-        if (part->svc_id != 0) {
+
                 part->pcnt = vpc_fs;
                 part->fstype = pspec->fstype;
         }
-
-        part->capacity = pspec->capacity;
 
         if (rpart != NULL)

uspace/srv/volsrv/volsrv.c

@@ -226 +226 @@
         }
 
+        part->pcnt = vpc_fs;
+        part->fstype = fstype;
+
         async_answer_0(iid, EOK);
 }