Changeset 3610 in MondoRescue for branches/3.2/mondo/src/mondorestore/mondo-rstr-tools.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/mondo-rstr-tools.c (modified) (9 diffs)

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) {