Changeset 3610 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondorestore.c

Timestamp:

Nov 5, 2016, 6:12:23 PM (7 years ago)

Author:

Bruno Cornec

Message:

• Change interfaces for the call_program_and_get_last_line_of_output and where_is_root_mounted(now return dynamically allocated string)
• removes useless function store_netfs_config

File:

• branches/3.2/mondo/src/mondorestore/mondorestore.c (modified) (7 diffs)

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

@@ -1876 +1876 @@
     log_it("Done loading config file; resizing ML");
 
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
+    tmp1 = call_program_and_get_last_line_of_output("cat "CMDLINE);
     if (strstr(tmp1, "noresize")) {
         log_msg(1, "Not resizing mountlist.");
@@ -2102 +2102 @@
     get_cfg_file_from_archive_or_bust();
     load_mountlist(mountlist, g_mountlist_fname);   // in case read_cfg_file_into_bkpinfo updated the mountlist
-#ifdef __FreeBSD__
-    if (strstr(call_program_and_get_last_line_of_output("cat /tmp/cmdline"), "noresize"))
-#else
-    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "noresize"))
-#endif
-    {
+    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);
     if (flaws_str != NULL) {
@@ -2138 +2136 @@
             twenty_seconds_til_yikes();
             g_fprep = fopen("/tmp/prep.sh", "w");
-            mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
+            tmp1 = call_program_and_get_last_line_of_output("cat "CMDLINE);
             if (strstr(tmp1, "nopart")) {
                 log_msg(2, "Not partitioning drives due to 'nopart' option.");
@@ -2204 +2202 @@
 
   after_the_nuke:
-    mr_asprintf(tmp1, "%s", call_program_and_get_last_line_of_output("cat "CMDLINE));
+    tmp1 =call_program_and_get_last_line_of_output("cat "CMDLINE);
     if (retval) {
         log_to_screen("Errors occurred during the nuke phase.");
@@ -2595 +2593 @@
 
 /* Configure global variables */
-#ifdef __FreeBSD__
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /tmp/cmdline"),
-         "textonly"))
-#else
-    if (strstr
-        (call_program_and_get_last_line_of_output("cat /proc/cmdline"),
-         "textonly"))
-#endif
-    {
+    tmp = call_program_and_get_last_line_of_output("cat "CMDLINE);
+    if (strstr(tmp, "textonly")) {
         g_text_mode = TRUE;
         log_msg(1, "TEXTONLY MODE");
@@ -2610 +2600 @@
         g_text_mode = FALSE;
     }                           // newt :-)
+    mr_free(tmp);
+
     if (!(mountlist = malloc(sizeof(struct mountlist_itself)))) {
         fatal_error("Cannot malloc mountlist");
@@ -2622 +2614 @@
     malloc_libmondo_global_strings();
 
-    strcpy(g_mondo_home,
-           call_program_and_get_last_line_of_output("which mondorestore"));
+    tmp = call_program_and_get_last_line_of_output("which mondorestore");
+    strcpy(g_mondo_home, tmp);
+        mr_free(tmp);
+
     g_current_media_number = 1; // precaution
-
     run_program_and_log_output("mkdir -p " MNT_CDROM, FALSE);