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

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

@@ -230 +230 @@
     d = 5.2;                    // :-)
 #else
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("uname -r"));
+    tmp = call_program_and_get_last_line_of_output("uname -r");
     p = strchr(tmp, '.');
     if (p) {
@@ -452 +452 @@
         if (getenv ("SUDO_COMMAND")) {
             mr_asprintf(command, "strings `which growisofs` | grep -c SUDO_COMMAND");
-            if (!strcmp(call_program_and_get_last_line_of_output(command), "1")) {
-                mr_free(command);
+            tmp = call_program_and_get_last_line_of_output(command);
+            mr_free(command);
+            if (!strcmp(tmp, "1")) {
+                mr_free(tmp);
                 popup_and_OK("Fatal Error: Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
                 fatal_error("Can't write DVDs as sudo because growisofs doesn't support this - see the growisofs manpage for details.");
             }       
-            mr_free(command);
+            mr_free(tmp);
         }
         log_msg(2, "call_make_iso (DVD res) is ... %s", bkpinfo->call_make_iso);
@@ -550 +552 @@
         mr_asprintf(command, "df -P %s | tail -n1 | cut -d' ' -f1", bkpinfo->isodir);
         log_it("command = %s", command);
-        mr_asprintf(iso_dev, "%s", call_program_and_get_last_line_of_output(command));
+        iso_dev = call_program_and_get_last_line_of_output(command);
         log_it("res of it = %s", iso_dev);
         mr_asprintf(tmp, "%s/ISO-DEV", bkpinfo->tmpdir);
@@ -561 +563 @@
 
         log_it("command = %s", 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_asprintf(tmp, "%s/ISO-MNT", bkpinfo->tmpdir);
@@ -882 +884 @@
 
     mr_asprintf(command, "df -m -P %s | tail -n1 | tr -s ' ' '\t' | cut -f4", partition);
-    mr_asprintf(out_sz, "%s", call_program_and_get_last_line_of_output(command));
+    out_sz = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -923 +925 @@
         run_program_and_log_output("ln -sf `which mkfs.msdos` /sbin/mkfs.vfat", FALSE);
     }
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2"));
+    tmp = call_program_and_get_last_line_of_output("free | grep Mem | head -n1 | tr -s ' ' '\t' | cut -f2");
     if (atol(tmp) < 35000) {
         retval++;
@@ -986 +988 @@
     }
     run_program_and_log_output("umount `mount | grep cdr | cut -d' ' -f3 | tr '\n' ' '`", 5);
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\""));
+    tmp = call_program_and_get_last_line_of_output("mount | grep -E \"cdr(om|w)\"");
     if (strcmp("", tmp)) {
         if (strstr(tmp, "autofs")) {
@@ -1050 +1052 @@
     /*@ buffer ****************************************************** */
     char *command = NULL;
+    char *tmp = NULL;
 
     /*@ end vars *************************************************** */
@@ -1064 +1067 @@
     } else {
         mr_asprintf(command, "grep '%s .*' %s| cut -d' ' -f2,3,4,5", label, config_file);
-        strcpy(value, call_program_and_get_last_line_of_output(command));
+        tmp = call_program_and_get_last_line_of_output(command);
+        strcpy(value, tmp);
         mr_free(command);
 
@@ -1193 +1197 @@
     mr_asprintf(command, "%s", "grep -v \":\" /etc/fstab | grep -vE '^#.*$' | grep -E \"[   ]/boot[     ]\" | tr -s ' ' '\t' | cut -f1 | head -n1");
     log_msg(4, "Cool. 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);
 
@@ -1201 +1205 @@
     mr_free(tmp);
 
-    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);
 
@@ -1398 +1402 @@
 void stop_magicdev_if_necessary()
 {
-    strcpy(g_magicdev_command, call_program_and_get_last_line_of_output("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99"));
+    char *tmp = NULL;
+
+    tmp = call_program_and_get_last_line_of_output("ps ax | grep -w magicdev | grep -v grep | tr -s '\t' ' '| cut -d' ' -f6-99");
+    strcpy(g_magicdev_command, tmp);
     if (g_magicdev_command[0]) {
         log_msg(1, "g_magicdev_command = '%s'", g_magicdev_command);
         paranoid_system("killall magicdev");
     }
+    mr_free(tmp);
 }