Changeset 3377 in MondoRescue for branches/3.2/mondo

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

Location:

branches/3.2/mondo/src

Files:

• common/libmondo-devices.c (modified) (11 diffs)
• common/libmondo-string.c (modified) (1 diff)
• common/libmondo-tools.c (modified) (1 diff)
• common/newt-specific.c (modified) (1 diff)
• mondorestore/mondo-prep.c (modified) (3 diffs)
• restore-scripts/mondo/format-and-kludge-vfat (modified) (1 diff)
• restore-scripts/mondo/grub-MR (modified) (1 diff)
• restore-scripts/mondo/make-me-bootable (modified) (2 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);

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

@@ -69 +69 @@
 }
 
+
+/**
+ * Pad a string on both sides so it appears centered.
+ * @param in_out The string to be center-padded (modified).
+ * @param width The width of the final result.
+ */
+char *mr_center_string(char *in, int width)
+{
+    char *scratch = NULL;
+    char *out = NULL;
+    int i;                      /* purpose */
+    int len;                    /* purpose */
+    int mid;                    /* purpose */
+    int x;                      /* purpose */
+
+    assert(in != NULL);
+    assert(width > 2);
+
+    if (strlen(in) == 0) {
+        return(NULL);
+    }
+    /*  skip initial spaces */
+    mr_asprintf(scratch, "%s", in);
+    mr_strip_spaces(scratch);
+    len = (int)strlen(scratch);
+    mid = width / 2;
+    x = mid - len / 2;
+    for (i = 0; i < x; i++) {
+        mr_strcat(out,' ');
+    }
+    mr_strcat(out, scratch);
+    mr_free(scratch);
+    for (i = x + len ; i < width - 1; i++) {
+            mr_strcat(out,' ');
+        }
+    return(out);
+}
 
 /**

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

@@ -993 +993 @@
     mr_free(tmp);
 
-    if (!run_program_and_log_output("mr_parted2fdisk -l 2>/dev/null | grep -i raid", 1) && !does_file_exist("/etc/raidtab")) {
+    if (!run_program_and_log_output("mr-parted2fdisk -l 2>/dev/null | grep -i raid", 1) && !does_file_exist("/etc/raidtab")) {
         log_to_screen("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
         create_raidtab_from_mdstat(MDSTAT_FILE,"/etc/raidtab");

branches/3.2/mondo/src/common/newt-specific.c

@@ -717 +717 @@
         }
     }
+
+/**
+ * Ask the user to enter a value.
+ * @param title The title of the dialog box.
+ * @param b The blurb (e.g. what you want the user to enter).
+ * @param input The string to initialize the user's answer with.
+ * @return value needs to be freed up by caller
+ */
+char *mr_popup_and_get_string(char *title, char *b, char *input) {
+
+    /*@ newt ************************************************************ */
+    newtComponent myForm;
+    newtComponent b_1;
+    newtComponent b_2;
+    newtComponent b_res;
+    newtComponent text;
+    newtComponent type_here;
+
+    char *entry_value = NULL;
+    char *blurb = NULL;
+    char *out = NULL;
+
+    assert_string_is_neither_NULL_nor_zerolength(title);
+    assert(b != NULL);
+
+    if (g_text_mode) {
+        printf("---promptstring---1--- %s\n---promptstring---2--- %s\n---promptstring---Q---\n-->  ", title, b);
+        mr_getline(out, stdin);
+        if (out[strlen(out) - 1] == '\n')
+            out[strlen(out) - 1] = '\0';
+        return(out);
+    }
+
+    assert(input != NULL);
+    text = newtTextboxReflowed(2, 1, b, 48, 5, 5, 0);
+    type_here = newtEntry(2, newtTextboxGetNumLines(text) + 2, input, 50, (void *) &entry_value, NEWT_FLAG_RETURNEXIT);
+    b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
+    b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
+    newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
+    myForm = newtForm(NULL, NULL, 0);
+    newtFormAddComponents(myForm, text, type_here, b_1, b_2, NULL);
+    blurb = mr_center_string(b, 80);
+    newtPushHelpLine(blurb);
+    b_res = newtRunForm(myForm);
+
+    newtPopHelpLine();
+    newtFormDestroy(myForm);
+    newtPopWindow();
+    mr_free(blurb);
+
+    if (b_res != b_2) {
+        out = entry_value;
+    }
+    return(out);
+}
 
 /**

branches/3.2/mondo/src/mondorestore/mondo-prep.c

@@ -1347 +1347 @@
 #else
 make_hole_for_file(FDISK_LOG);
-mr_asprintf(tmp, "mr_parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
+mr_asprintf(tmp, "mr-parted2fdisk %s >> %s 2>> %s", drivename, FDISK_LOG, FDISK_LOG);
 pout_to_fdisk = popen(tmp, "w");
 if (!pout_to_fdisk) {
-    log_to_screen("Cannot call mr_parted2fdisk to configure %s", drivename);
+    log_to_screen("Cannot call mr-parted2fdisk to configure %s", drivename);
     mr_free(tmp);
     return (1);
@@ -1587 +1587 @@
 
 
-mr_asprintf(program, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+mr_asprintf(program, "mr-parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
 
 /* BERLIOS: should not be called each time */
@@ -1906 +1906 @@
     } else {
         mr_asprintf(output, "t\n%d\n%s\nw\n", partno, partcode);
-        mr_asprintf(command, "mr_parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
+        mr_asprintf(command, "mr-parted2fdisk %s >> %s 2>> %s", drive, MONDO_LOGFILE, MONDO_LOGFILE);
         log_msg(5, "output = '%s'", output);
         log_msg(5, "partno=%d; partcode=%s", partno, partcode);

branches/3.2/mondo/src/restore-scripts/mondo/format-and-kludge-vfat

@@ -28 +28 @@
     device=$1
     drive=$2
-    ftype=`mr_parted2fdisk -l $drive 2>/dev/null | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
+    ftype=`mr-parted2fdisk -l $drive 2>/dev/null | grep $device | tr '*' ' ' | tr -s '\t' ' ' | cut -d' ' -f5`
     case $ftype in
 #   "b" | "c")

branches/3.2/mondo/src/restore-scripts/mondo/grub-MR

@@ -169 +169 @@
     line=`grep $base /proc/mdstat | head -n1`
     echo "mbrdev was $mbrdev" 2>&1 | tee -a $LOGFILE
-    mbrdev=`mr_parted2fdisk -l 2>/dev/null | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
+    mbrdev=`mr-parted2fdisk -l 2>/dev/null | grep /dev/ | head -n1 | tr ':' ' ' | cut -d' ' -f2`
     echo "mbrdev is $mbrdev" 2>&1 | tee -a $LOGFILE
     partno="0"; # cheating - FIXME    

branches/3.2/mondo/src/restore-scripts/mondo/make-me-bootable

@@ -17 +17 @@
 dummy="$3"
 
-activepart=`mr_parted2fdisk -l $drivetouse 2>/dev/null | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
+activepart=`mr-parted2fdisk -l $drivetouse 2>/dev/null | tr -s '\t' ' ' | grep "$drivetouse" | grep '*' | cut -d' ' -f1`
 
 for i in `cat $1 | tr -s '\t' ' ' | cut -d' ' -f1 | grep -vE "/dev/fd|none|#"` ; do
@@ -66 +66 @@
         echo "Would activate $partno on $drive" >> $LOGFILE
     else
-        echo -en "${cmd}a\n$partno\np\nw\n" | mr_parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
+        echo -en "${cmd}a\n$partno\np\nw\n" | mr-parted2fdisk $drive >> $LOGFILE 2>> $LOGFILE
     fi
 fi