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

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