Changeset 9bda5d90 in mainline for uspace/app/hdisk/func_mbr.c

Timestamp:

2013-05-03T01:20:11Z (12 years ago)

Author:

Dominik Taborsky (AT DOT) <brembyseznamcz>

Branches:

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

Children:

469739f, c9f61150, f6c8fca

Parents:

700f89e

Message:

libmbr final

File:

• uspace/app/hdisk/func_mbr.c (modified) (7 diffs)

uspace/app/hdisk/func_mbr.c

@@ -68 +68 @@
         printf("Number of the partition to delete (counted from 0): ");
         idx = get_input_size_t(in);
-
+        
+        if (idx == 0 && errno != EOK)
+                return errno;
+        
         rc = mbr_remove_partition(data->mbr.parts, idx);
         if(rc != EOK) {
@@ -81 +84 @@
         data->mbr.mbr = mbr_alloc_mbr();
         data->mbr.parts = mbr_alloc_partitions();
+        return EOK;
 }
 
@@ -103 +107 @@
                         printf(" ");
 
-                printf("\t%10u %10u %10u %7x\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
+                printf("\t%10u %10u %10u %7u\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
 
                 ++num;
@@ -109 +113 @@
 
         printf("%d partitions found.\n", num);
-        printf("DEBUG: primary: %hhu, logical: %u\n", data->mbr.parts->n_primary, data->mbr.parts->n_logical);
         
         return EOK;
@@ -126 +129 @@
 int extra_mbr_funcs(tinput_t * in, service_id_t dev_handle, union table_data * data)
 {
+        printf("Not implemented.\n");
         return EOK;
 }
@@ -152 +156 @@
         printf("Set type (0-255): ");
         type = get_input_uint8(in);
+        if (type == 0 && errno != EOK)
+                return errno;
 
         ///TODO: there can only be one bootable partition; let's do it just like fdisk
@@ -168 +174 @@
         printf("Set starting address (number): ");
         sa = get_input_uint32(in);
+        if (sa == 0 && errno != EOK)
+                return errno;
 
         printf("Set end addres (number): ");
         ea = get_input_uint32(in);
+        if (ea == 0 && errno != EOK)
+                return errno;
         
         if(ea < sa) {