Changeset 3377 in MondoRescue for branches/3.2/mondo/src/common/libmondo-devices.c

Timestamp:

May 6, 2015, 1:10:17 PM (9 years ago)

Author:

Bruno Cornec

Message:

• Rename mr_parted2fdisk to mr-parted2fdisk for consistency with all other new mr-* commands
• Adds functions mr_center_string and mr_popup_and_get_string with dynamic allocation to solve a memory allocation issue reported on the ML
• Fix mr_boot_type to detect correctly a UEFI based system

File:

• branches/3.2/mondo/src/common/libmondo-devices.c (modified) (11 diffs)

branches/3.2/mondo/src/common/libmondo-devices.c

@@ -327 +327 @@
 #else
     return
-        !system("mr_parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|EFI|FAT|NTFS)'");
+        !system("mr-parted2fdisk -l 2>/dev/null | grep '^/dev/' | grep -Eqv '(MS|DOS|EFI|FAT|NTFS)'");
 #endif
 }
@@ -364 +364 @@
 #endif
 
-    mr_asprintf(program, "mr_parted2fdisk -l %s 2> /dev/null", drive);
+    mr_asprintf(program, "mr-parted2fdisk -l %s 2> /dev/null", drive);
     fin = popen(program, "r");
     if (!fin) {
@@ -1729 +1729 @@
     * Either way, it's an error.
     ********/
-    mr_asprintf(command, "mr_parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
+    mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null|grep -E \"^/dev/\"|awk '{printf(\"%%s \", $1)}END{print \"\"}'", dsf);
     log_msg(5, "Executing: %s", command);
     mr_asprintf(partition_list, "%s", call_program_and_get_last_line_of_output(command));
@@ -1795 +1795 @@
         log_msg(4, "Processing partition: %s", partitions[i]);
         /* See if it's swap. If it is, ignore it. */
-        mr_asprintf(command, "mr_parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);
+        mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null | awk '{if(($1==\"%s\")&&(toupper($0) ~ \"SWAP\")){print $1;exit}}'", ndsf, partitions[i]);
         log_msg(5, "  Running: %s", command);
         mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
@@ -2110 +2110 @@
 
     t_boot ret = BIOS;
-    FILE *fd = NULL;
+    DIR *fd = NULL;
 
 #ifdef __IA64__
@@ -2116 +2116 @@
 #endif
     /* Try to detect whether we are in fact in UEFI mode */
-    /* TODO: find the right trigger */
-    fd = fopen("/sys/module/efi", "r");
+    fd = opendir("/sys/firmware/efi", "r");
     if (fd != NULL) {
         ret = UEFI;
+        closedir(fd);
     }
     return(ret);
@@ -2365 +2365 @@
         mr_free(tmp);
 
-        if (!popup_and_get_string("Tape block size?", "What is the block size of your tape streamer?", sz_size, 15)) {
+        mr_asprintf(sz_size,"%s",bkpinfo->internal_tape_block_size);
+        tmp = mr_popup_and_get_string("Tape block size?", "What is the block size of your tape streamer?", sz_size);
+        if (tmp == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        bkpinfo->internal_tape_block_size = atol(sz_size);
+        bkpinfo->internal_tape_block_size = atol(tmp);
+        mr_free(sz_size);
+        mr_free(tmp);
+
         if (bkpinfo->internal_tape_block_size <= 0) {
             log_to_screen("User has chosen not to backup the PC");
@@ -2682 +2687 @@
         mr_free(tmp);
 // NTFS 
-        strcpy(tmp1, call_program_and_get_last_line_of_output("mr_parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
+        strcpy(tmp1, call_program_and_get_last_line_of_output("mr-parted2fdisk -l 2>/dev/null | grep -i ntfs | awk '{ print $1};' | tr -s '\\n' ' ' | awk '{ print $0};'"));
         if (strlen(tmp1) > 2) {
             if (!popup_and_get_string("NTFS partitions", "Please enter/confirm the NTFS partitions you wish to backup as well.", tmp1, MAX_STR_LEN / 4)) {
@@ -3100 +3105 @@
     assert(which_device != NULL);
 
-    mr_asprintf(list_drives_cmd, "mr_parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());
+    mr_asprintf(list_drives_cmd, "mr-parted2fdisk -l 2>/dev/null | grep \"/dev/.*:\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/; echo %s", where_is_root_mounted());
     log_it("list_drives_cmd = %s", list_drives_cmd);
 
@@ -3142 +3147 @@
     } else {
         // We need to look on each partition then
-        mr_asprintf(list_drives_cmd, "mr_parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
+        mr_asprintf(list_drives_cmd, "mr-parted2fdisk -l 2>/dev/null | grep -E \"^/dev/\" | tr -s ':' ' ' | tr -s ' ' '\n' | grep /dev/");
         log_it("list_drives_cmd = %s", list_drives_cmd);
 
@@ -3290 +3295 @@
     struct stat buf;
 #endif
-    mr_asprintf(command, "mr_parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
+    mr_asprintf(command, "mr-parted2fdisk -l %s 2>/dev/null | grep 'EFI GPT'", drive);
     mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
     mr_free(command);