Changeset 30440ed in mainline for uspace/app/hdisk/func_mbr.c

Timestamp:

2013-04-08T23:15:42Z (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:

256cbfe

Parents:

271e24a

Message:

save progress

File:

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

uspace/app/hdisk/func_mbr.c

@@ -35 +35 @@
 #include <stdio.h>
 #include <errno.h>
+#include <str_error.h>
 #include <sys/types.h>
 
@@ -94 +95 @@
                         printf(" ");
 
-                printf("\t\t%u\t%u\t%u\t%d\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
+                printf("\t%10u %10u %10u %3d\n", it->start_addr, it->start_addr + it->length, it->length, it->type);
 
                 ++num;
@@ -108 +109 @@
         int rc = mbr_write_partitions(data->mbr.parts, data->mbr.mbr, dev_handle);
         if (rc != EOK) {
-                printf("Error occured during writing. (ERR: %d)\n", rc);
+                printf("Error occured during writing: ERR: %d: %s\n", rc, str_error(rc));
         }
         
@@ -114 +115 @@
 }
 
-
+int extra_mbr_funcs(tinput_t * in, service_id_t dev_handle, union table_data * data)
+{
+        return EOK;
+}
 
 static int set_mbr_partition(tinput_t * in, mbr_part_t * p)
@@ -123 +127 @@
         printf("Primary (p) or logical (l): ");
         c = getchar();
+        printf("%c\n", c);
 
         switch(c) {
                 case 'p':
                         mbr_set_flag(p, ST_LOGIC, false);
+                        break;
                 case 'l':
                         mbr_set_flag(p, ST_LOGIC, true);
+                        break;
                 default:
                         printf("Invalid type. Cancelled.");
@@ -144 +151 @@
                 return EINVAL;
         }
-        
+        printf("%c\n", c);
         mbr_set_flag(p, ST_BOOT, (c == 'y' || c == 'Y') ? true : false);