Changeset 2383 in MondoRescue for branches/2.2.10/mondo/src/mondorestore

Timestamp:

Sep 10, 2009, 2:55:51 AM (15 years ago)

Author:

Bruno Cornec

Message:

call_program_and_get_last_line_of_output is now allocating memory and returning that string

Location:

branches/2.2.10/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (3 diffs)
• mondo-rstr-tools.c (modified) (9 diffs)
• mondorestore.c (modified) (8 diffs)

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

@@ -336 +336 @@
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
+                tmp = call_program_and_get_last_line_of_output(tmp1);
                 mr_free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
+                tmp = call_program_and_get_last_line_of_output(tmp1);
                 mr_free(tmp1);
             }
@@ -1414 +1414 @@
     char *format = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
 
     /** end *************************************************************/
@@ -1578 +1579 @@
     if (pout_to_fdisk) {
         // mark relevant partition as bootable
-        mr_asprintf(tmp, "a\n%s\n", call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy"));
+        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy");
+        mr_asprintf(tmp, "a\n%s\n", tmp1);
+        mr_free(tmp1);
+
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);

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

@@ -756 +756 @@
         }
     
-        if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
+        tmp = call_program_and_get_last_line_of_output("cat " CMDLINE);
+        if (strstr(tmp, "pxe")) {
             /* We need to override prefix value in PXE mode as it's 
             * already done in start-netfs */
@@ -766 +767 @@
             mr_asprintf(bkpinfo->prefix, "%s", envtmp1);
         }
+        mr_free(tmp);
 
     } else if (!strcmp(value, "tape")) {
@@ -939 +941 @@
 
 tmp = read_cfg_var(g_mondo_cfg_file, "please-dont-eject");
-if (tmp || strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "donteject")) {
+tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+if (tmp || strstr(tmp1, "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
     log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
 }
 mr_free(tmp);
+mr_free(tmp1);
 
 if (bkpinfo->backup_media_type == netfs) {
@@ -971 +975 @@
         }
     }
-    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "pxe")) {
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    if (strstr(tmp1, "pxe")) {
+        mr_free(tmp1);
         /* We need to override values in PXE mode as it's
         * already done in start-netfs */
@@ -987 +993 @@
         mr_free(bkpinfo->netfs_remote_dir);
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", envtmp2);
-    }
+    } else {
+        mr_free(tmp1);
+    }
+
 } else if (bkpinfo->backup_media_type == iso) {
     /* Patch by Conor Daly 23-june-2004 
@@ -1025 +1034 @@
             mr_asprintf(command, "mount | grep -E '^%s' | tail -n1 | cut -d' ' -f3", g_isodir_device);
             log_it("command = %s", command);
-            log_it("res of it = %s", call_program_and_get_last_line_of_output(command));
-            mr_asprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+            iso_mnt = call_program_and_get_last_line_of_output(command);
+            log_it("res of it = %s", iso_mnt);
             mr_free(command);
         } else {
@@ -2174 +2183 @@
     char *mounted_cfgf_path;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *mountpt = NULL;
     char *ramdisk_fname;
@@ -2290 +2300 @@
     if (does_file_exist(MONDO_CFG_FILE_STUB)) {
         log_msg(1, "gcffa --- great! We've got the config file");
-        mr_asprintf(tmp, "%s/%s", call_program_and_get_last_line_of_output("pwd"), MONDO_CFG_FILE_STUB);
+        tmp = call_program_and_get_last_line_of_output("pwd");
+        mr_strcat(tmp, "/%s", MONDO_CFG_FILE_STUB);
         mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
@@ -2300 +2311 @@
         mr_free(command);
 
-        mr_asprintf(command, "cp -f %s/%s %s", call_program_and_get_last_line_of_output("pwd"),
-            MOUNTLIST_FNAME_STUB, mountlist_file);
+        tmp1 = call_program_and_get_last_line_of_output("pwd");
+        mr_asprintf(command, "cp -f %s/%s %s", tmp1, MOUNTLIST_FNAME_STUB, mountlist_file);
+        mr_free(tmp1);
+
         log_it("%s",command);
         if (extract_mountlist_stub) {

branches/2.2.10/mondo/src/mondorestore/mondorestore.c

@@ -470 +470 @@
     log_it("Done loading config file; resizing ML");
 
-    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "noresize")) {
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
+    mr_free(tmp1);
+
     for (done = FALSE; !done;) {
         log_it("About to edit mountlist");
@@ -750 +753 @@
     int res = 0;
     bool boot_loader_installed = FALSE;
-  /** malloc **/
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *flaws_str = NULL;
 
@@ -762 +765 @@
     get_cfg_file_from_archive_or_bust();
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
-    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "noresize")) {
+
+    tmp = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    if (strstr(tmp, "noresize")) {
         log_msg(2, "Not resizing mountlist.");
     } else {
         resize_mountlist_proportionately_to_suit_new_drives(mountlist);
     }
+    mr_free(tmp);
+
     flaws_str = evaluate_mountlist(mountlist, &res);
     if (!res) {
@@ -795 +802 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-            if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "nopart")) {
-                log_msg(2,
-                        "Not partitioning drives due to 'nopart' option.");
+            tmp = call_program_and_get_last_line_of_output("cat " CMDLINE);
+            if (strstr(tmp, "nopart")) {
+                log_msg(2, "Not partitioning drives due to 'nopart' option.");
                 res = 0;
             } else {
                 res = partition_everything(mountlist);
                 if (res) {
-                    log_to_screen
-                        ("Warning. Errors occurred during partitioning.");
+                    log_to_screen("Warning. Errors occurred during partitioning.");
                     res = 0;
                 }
             }
+            mr_free(tmp);
+
             retval += res;
             if (!res) {
@@ -867 +875 @@
 
   after_the_nuke:
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
-    } else if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "RESTORE")) {
-        log_to_screen
-            ("PC was restored successfully. Thank you for using Mondo Rescue.");
-        log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
+    } else if (tmp1, "RESTORE")) {
+        log_to_screen("PC was restored successfully. Thank you for using Mondo Rescue.");
+        log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
     } else {
         mr_asprintf(tmp,"%s","Mondo has restored your system.\n\nPlease wait for the command prompt. Then remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
@@ -882 +889 @@
         log_to_screen("Please visit our website at http://www.mondorescue.org for more information.");
     }
+    mr_free(tmp1);
+
     g_I_have_just_nuked = TRUE;
     return (retval);
@@ -2618 +2627 @@
     /* Configure global variables */
     malloc_libmondo_global_strings();
-    if (strstr(call_program_and_get_last_line_of_output("cat " CMDLINE), "textonly"))
-    {
+    tmp1 = call_program_and_get_last_line_of_output("cat " CMDLINE);
+    if (strstr(tmp1, "textonly")) {
         g_text_mode = TRUE;
         log_msg(1, "TEXTONLY MODE");
@@ -2625 +2634 @@
         g_text_mode = FALSE;
     }                           // newt :-)
+    mr_free(tmp1);
 
     /* Init GUI */
     setup_newt_stuff();         /* call newtInit and setup screen log */
 
-    strcpy(g_mondo_home, call_program_and_get_last_line_of_output("which mondorestore"));
+    tmp1 = call_program_and_get_last_line_of_output("which mondorestore");
+    strcpy(g_mondo_home, tmp1);
+    mr_free(tmp1);
+
     g_current_media_number = 1; // precaution