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

branches/2.2.10/mondo/src/common/libmondo-archive.c

@@ -539 +539 @@
     if (bkpinfo->exclude_paths) {
         mr_asprintf(tmp, "echo '%s' | tr -s ' ' '\n' | grep -E '^/dev/.*$' | tr -s '\n' ' ' | awk '{print $0\"\\n\";}'", bkpinfo->exclude_paths);
-        mr_asprintf(devs_to_exclude, "%s", call_program_and_get_last_line_of_output(tmp));
+        devs_to_exclude = call_program_and_get_last_line_of_output(tmp);
         mr_free(tmp);
 
@@ -626 +626 @@
 
 #ifdef __FreeBSD__
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'"));
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/\\([0-9]\\).*/\\1/'");
         }
 #else
         /* Linux */
 #ifdef __IA64__
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
 #else
-        mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+        bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
 #endif
         if (strstr(bootdev, "/dev/cciss/")) {
             mr_free(bootdev);
 #ifdef __IA64__
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot/efi ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
 #else
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' /boot ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
 #endif
         }
         if (!bootdev[0]) {
             mr_free(bootdev);
-            mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'"));
+            bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | sed 's/[0-9].*//'");
             if (strstr(bootdev, "/dev/cciss/")) {
                 mr_free(bootdev);
-                mr_asprintf(bootdev, "%s", call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1"));
+                bootdev = call_program_and_get_last_line_of_output("mount | grep ' / ' | head -1 | cut -d' ' -f1 | cut -dp -f1");
             }
         }
@@ -928 +928 @@
         log_to_screen("Mindi failed to create your boot+data disks.");
         mr_asprintf(command, "grep 'Fatal error' /var/log/mindi.log");
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+        tmp = call_program_and_get_last_line_of_output(command);
         mr_free(command);
 
@@ -1185 +1185 @@
     mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-    mr_asprintf(g_serial_string, "%s", call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1"));
+    g_serial_string = call_program_and_get_last_line_of_output("dd  if=/dev/urandom bs=16 count=1 2> /dev/null |  hexdump | tr -s ' ' '0' | head -n1");
     mr_strip_spaces(g_serial_string);
     mr_strcat(g_serial_string, "...word.");
@@ -1892 +1892 @@
     mr_asprintf(command, "dd if=%s bs=512 count=1 2> /dev/null | strings | head -n1", bigfile_fname);
     log_msg(1, "command = '%s'", command);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+    tmp = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -2660 +2660 @@
             mr_asprintf(tmp, "cat %s 2> /dev/null", szserfname);
             mr_free(our_serial_str);
-            mr_asprintf(our_serial_str, "%s", call_program_and_get_last_line_of_output(tmp));
+            our_serial_str = call_program_and_get_last_line_of_output(tmp);
             mr_free(tmp);
             // FIXME - should be able to use last_line_of_file(), surely?
@@ -2859 +2859 @@
         mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", biggie_filename);
         log_it("command = %s", command);
-        mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output(command));
+        tmp = call_program_and_get_last_line_of_output(command);
         mr_free(command);
         log_it("res of it = %s", tmp);