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

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

File:

• branches/2.2.10/mondo/src/mondorestore/mondorestore.c (modified) (8 diffs)

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