Changeset 2316 in MondoRescue for branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

Timestamp:

Aug 18, 2009, 2:34:29 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3327@localhost: bruno | 2009-08-04 00:17:46 +0200
popup_and_get_string and build_partition_name now return an allocated string

File:

• branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c (modified) (18 diffs)

branches/2.2.10/mondo/src/mondorestore/mondo-rstr-tools.c

@@ -42 +42 @@
 */
 extern char *g_isodir_device;
-extern char *g_isodir_format;
 extern long g_current_progress, g_maximum_progress;
 extern char *g_biggielist_txt;  // where 'biggielist.txt' is stored, on ramdisk / tempdir;
@@ -96 +95 @@
 */
 paranoid_free(g_isodir_device);
-paranoid_free(g_isodir_format);
 
 }
@@ -264 +262 @@
     int retval = 0, i;
     bool already_mounted = FALSE;
+    char *isodir_format = NULL;
 
 assert(bkpinfo != NULL);
@@ -281 +280 @@
 }
 
-if (!get_isodir_info(g_isodir_device, g_isodir_format, bkpinfo->isodir, nuke_me_please)) {
+if (!get_isodir_info(g_isodir_device, isodir_format, bkpinfo->isodir, nuke_me_please)) {
+    mr_free(isodir_format);
     return (1);
 }
@@ -291 +291 @@
 } else {
     mr_asprintf(&mount_isodir_command, "mount %s", g_isodir_device);
-    if (strlen(g_isodir_format) > 1) {
-        mr_strcat(mount_isodir_command, " -t %s", g_isodir_format);
-    }
+    if (isodir_format) {
+        mr_strcat(mount_isodir_command, " -t %s", isodir_format);
+    }
+
     mr_strcat(mount_isodir_command, " -o ro %s", bkpinfo->isodir);
     run_program_and_log_output("df -m", FALSE);
@@ -308 +309 @@
     ("I have mounted the device where the ISO files are stored.");
 }
+mr_free(isodir_format);
+
 if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
     mount_media();
@@ -1426 +1429 @@
   /** malloc **/
     char *command = NULL;
-    char *boot_device;
+    char *boot_device = NULL;
     char *rootdev;
     char *rootdrive;
@@ -1432 +1435 @@
     char *tmp = NULL;
     char *editor;
-
-    int res;
-    int done;
-
-    malloc_string(boot_device);
+    char *p = NULL;
+
+    int res = 0;
+    bool done;
+
     malloc_string(editor);
     malloc_string(rootdev);
@@ -1443 +1446 @@
     assert_string_is_neither_NULL_nor_zerolength(bd);
     strcpy(editor, find_my_editor());
-    strcpy(boot_device, bd);
+    mr_asprintf(&boot_device, "%s", bd);
 
     if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY,
                             0,
                             "Modifying fstab, mtab, device.map and menu.lst, and running GRUB...                             ");
         for (done = FALSE; !done;) {
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            mr_asprintf(&command, "stabgrub-me %s", boot_device);
+            p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
+            if (p == NULL) {
+                done = TRUE;
+                mr_free(p);
+                /* we want some warnings later on */
+                res = 1;
+                continue;
+            }
+            mr_asprintf(&command, "stabgrub-me %s", p);
+            mr_free(p);
+
             res = run_program_and_log_output(command, 1);
             mr_free(command);
@@ -1494 +1503 @@
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
         if (!run_program_and_log_output("which grub-MR", FALSE)) {
             log_msg(1, "Yay! grub-MR found...");
@@ -1521 +1529 @@
         }
     }
+    mr_free(boot_device);
+
     if (res) {
         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
@@ -1540 +1550 @@
     paranoid_free(rootdrive);
     paranoid_free(conffile);
-    paranoid_free(boot_device);
     paranoid_free(editor);
 
@@ -1744 +1753 @@
   /** malloc **/
     char *command = NULL;
-    char *boot_device;
+    char *boot_device = NULL;
     char *tmp = NULL;
     char *editor;
+    char *p = NULL;
     int res;
     int done;
 
-    malloc_string(boot_device);
     malloc_string(editor);
     assert_string_is_neither_NULL_nor_zerolength(bd);
 
     strcpy(editor, find_my_editor());
-    strcpy(boot_device, bd);
+    mr_asprintf(&boot_device, "%s", bd);
 
     if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?"))
+        && ask_me_yes_or_no("Did you change the mountlist or cloned the system ?")) {
         /* interactive mode */
-    {
         mvaddstr_and_log_it(g_currentY, 0,
                             "Modifying fstab and restoring MBR...                           ");
@@ -1776 +1784 @@
                 }
             }
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
-                                 boot_device, MAX_STR_LEN / 4);
-            mr_asprintf(&command, "stabraw-me %s", boot_device);
+            p = popup_and_get_string("Boot device", "Please confirm/enter the boot device. If in doubt, try /dev/hda", boot_device);
+            if (p == NULL) {
+                done = TRUE;
+                mr_free(p);
+                /* we want some warnings later on */
+                res = 1;
+                continue;
+            }
+            mr_asprintf(&command, "stabraw-me %s", p);
+            mr_free(p);
+
             res = run_program_and_log_output(command, 3);
             mr_free(command);
@@ -1789 +1804 @@
             }
         }
-    } else
+    } else {
         /* nuke mode */
-    {
         mr_asprintf(&command, "raw-MR %s /tmp/mountlist.txt", boot_device);
         log_msg(2, "run_raw_mbr() --- command='%s'", command);
@@ -1800 +1814 @@
         mr_free(command);
     }
+    mr_free(boot_device);
 
     if (res) {
@@ -1808 +1823 @@
         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
-    paranoid_free(boot_device);
     paranoid_free(editor);
     return (res);
@@ -1839 +1853 @@
     malloc_string(g_mondo_home);
     malloc_string(g_isodir_device);
-    malloc_string(g_isodir_format);
 
     temppath = bkpinfo->tmpdir;