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

Timestamp:

Nov 5, 2016, 6:12:23 PM (8 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

Location:

branches/3.2/mondo/src/mondorestore

Files:

• mondo-prep.c (modified) (4 diffs)
• mondo-rstr-tools.c (modified) (9 diffs)
• mondorestore.c (modified) (7 diffs)

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

@@ -154 +154 @@
 char *tmp;
 char *tmp1 = NULL;
+char *tmp2 = NULL;
 char *incoming;
 char *command;
@@ -186 +187 @@
 #endif
 
-if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "nolvm")) {
+tmp = call_program_and_get_last_line_of_output("cat "CMDLINE);
+if (strstr(tmp, "nolvm")) {
+    mr_free(tmp);
     return(0);
 }
+mr_free(tmp);
+
 if (!(fin = fopen("/tmp/i-want-my-lvm", "r"))) {
     log_OS_error("/tmp/i-want-my-lvm");
@@ -299 +304 @@
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
-                free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                strcpy(tmp, call_program_and_get_last_line_of_output(tmp1));
-                free(tmp1);
             }
+            tmp2 =  call_program_and_get_last_line_of_output(tmp1);
+            strcpy(tmp, tmp2);
+            mr_free(tmp2);
+            mr_free(tmp1);
+
             for (p = tmp; *p != '\0' && !isdigit(*p); p++);
             extents = atol(p);
@@ -1482 +1488 @@
     // mark relevant partition as bootable
     mr_asprintf(tmp1,"mr-make-me-bootable /tmp/mountlist.txt %s",drivename);
-    call_program_and_get_last_line_of_output(tmp1);
+    tmp = call_program_and_get_last_line_of_output(tmp1);
     mr_free(tmp1);
+    mr_free(tmp);
 
     log_msg(0,"------------------- end of fdisk.log...       ------------------");

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

@@ -695 +695 @@
                 strcpy(bkpinfo->prefix,STD_PREFIX);
         }
-        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
+        tmp1 = call_program_and_get_last_line_of_output("cat "CMDLINE);
+        if (strstr(tmp1, "pxe")) {
             /* We need to override prefix value in PXE mode as it's
             * already done in start-netfs */
@@ -704 +705 @@
             strcpy(bkpinfo->prefix,envtmp1);
         }   
+        mr_free(tmp1);
     } else if (!strcmp(value, "tape")) {
         bkpinfo->backup_media_type = tape;
@@ -832 +834 @@
 
 read_cfg_var(cfg_file, "please-dont-eject", value);
-if (value[0] || strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "donteject")) {
+tmp1 = call_program_and_get_last_line_of_output("cat "CMDLINE);
+if (value[0] || strstr(tmp1, "donteject")) {
     bkpinfo->please_dont_eject = TRUE;
     log_msg(2, "Ok, I shan't eject when restoring! Groovy.");
 }
+mr_free(tmp1);
 
 /* TODO: Read here the boot_* variables */
@@ -881 +885 @@
         }
     }
-    if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "pxe")) {
+    tmp1 = call_program_and_get_last_line_of_output("cat "CMDLINE);
+    if (strstr(tmp1, "pxe")) {
         /* We need to override values in PXE mode as it's
         * already done in start-netfs */
@@ -898 +903 @@
         mr_asprintf(bkpinfo->netfs_remote_dir, "%s", envtmp2);
     }
+    mr_free(tmp1);
 } else if (bkpinfo->backup_media_type == iso) {
     /* Patch by Conor Daly 23-june-2004 
@@ -932 +938 @@
             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));
-            sprintf(iso_mnt, "%s", call_program_and_get_last_line_of_output(command));
+            tmp1 = call_program_and_get_last_line_of_output(command);
+            log_it("res of it = %s", tmp1);
+            sprintf(iso_mnt, "%s", tmp1);
             mr_free(command);
+            mr_free(tmp1);
         } else {
             sprintf(iso_mnt, "/tmp/isodir");
@@ -2064 +2072 @@
     char *cfg_file = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
     char *mountpt = NULL;
     char *mountlist_file = NULL;
@@ -2177 +2186 @@
     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);
+        tmp1 = call_program_and_get_last_line_of_output("pwd");
+        mr_asprintf(tmp, "%s/%s", tmp1, MONDO_CFG_FILE_STUB);
         mr_asprintf(command, "cp -f %s %s", tmp, cfg_file);
         log_it("%s",command);
@@ -2189 +2199 @@
         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);
+        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/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);