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

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

@@ -336 +336 @@
             if (lvmversion == 2) {
                 mr_asprintf(tmp1, "tail -n5 %s | grep Insufficient | tail -n1", MONDO_LOGFILE);
-                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
+                tmp = call_program_and_get_last_line_of_output(tmp1);
                 mr_free(tmp1);
             } else {
                 mr_asprintf(tmp1, "tail -n5 %s | grep lvcreate | tail -n1", MONDO_LOGFILE);
-                mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(tmp1));
+                tmp = call_program_and_get_last_line_of_output(tmp1);
                 mr_free(tmp1);
             }
@@ -1414 +1414 @@
     char *format = NULL;
     char *tmp = NULL;
+    char *tmp1 = NULL;
 
     /** end *************************************************************/
@@ -1578 +1579 @@
     if (pout_to_fdisk) {
         // mark relevant partition as bootable
-        mr_asprintf(tmp, "a\n%s\n", call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy"));
+        tmp1 = call_program_and_get_last_line_of_output ("make-me-bootable /tmp/mountlist.txt dummy");
+        mr_asprintf(tmp, "a\n%s\n", tmp1);
+        mr_free(tmp1);
+
         fput_string_one_char_at_a_time(pout_to_fdisk, tmp);
         mr_free(tmp);