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

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

@@ -550 +550 @@
 
 #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");
             }
         }
@@ -620 +620 @@
         if ((!does_file_exist("/boot/grub/menu.lst")) && (!does_file_exist("/boot/grub/grub.cfg")) && (!does_file_exist("/boot/grub2/grub.cfg"))) {
             /* if UEFI then search under /boot/efi */
-            mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("find /boot/efi -name grub.c*"));
+            tmp = call_program_and_get_last_line_of_output("find /boot/efi -name grub.c*");
             if (strstr(tmp, "grub.c") == NULL) {
                 mr_free(bootldr_str);
                 fatal_error("The de facto standard location for your boot loader's config file is /boot/grub/menu.lst, /boot/grub/grub.cfg, or /boot/grub2/grub.cfg /boot/efi/.../grub.cfg but I cannot find it there. What is wrong with your Linux distribution?");
             }
-        }
-        mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub --version 2> /dev/null"));
+                        mr_free(tmp);
+        }
+        bootldr_ver = call_program_and_get_last_line_of_output("grub --version 2> /dev/null");
         if (strcmp(bootldr_ver,"") ==0) {
             mr_free(bootldr_ver);
-            mr_asprintf(bootldr_ver, "%s", call_program_and_get_last_line_of_output("grub2-install --version"));
+            bootldr_ver = call_program_and_get_last_line_of_output("grub2-install --version");
         }
     } else if (bkpinfo->boot_loader == 'E') {
@@ -881 +882 @@
         log_to_screen("Mindi failed to create your boot+data disks.");
         mr_asprintf(command, "grep 'Fatal error' %s", MINDI_LOGFILE);
-        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);
 
@@ -1132 +1133 @@
     /*@ buffers *********************************** */
     char *command = NULL;
+    char *tmp = NULL;
     char *tmpfile = NULL;
     char *data_disks_file = NULL;
@@ -1138 +1140 @@
     mr_asprintf(data_disks_file, "%s/all.tar.gz", bkpinfo->tmpdir);
 
-    snprintf(g_serial_string, MAX_STR_LEN - 8, "%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"));
+        tmp = 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");
+    snprintf(g_serial_string, MAX_STR_LEN - 8, "%s", tmp);
+        mr_free(tmp);
     strip_spaces(g_serial_string);
     strcat(g_serial_string, "...word.");
@@ -1839 +1843 @@
     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);
 
@@ -2580 +2584 @@
             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?
@@ -2764 +2768 @@
         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);