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

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

@@ -274 +274 @@
     char *kernel = NULL;;
 
-    mr_asprintf(kernel, "%s", call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
+    kernel = call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null");
     
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
         mr_asprintf(command, "%s", "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);
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
@@ -331 +331 @@
     assert_string_is_neither_NULL_nor_zerolength(fname);
     mr_asprintf(command, "which %s 2> /dev/null", fname);
-    mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
+    output = call_program_and_get_last_line_of_output(command);
     mr_free(command);
     if (output[0] == '\0') {
@@ -340 +340 @@
         mr_asprintf(command, "file %s 2> /dev/null | cut -d':' -f1 2> /dev/null", output);
         mr_free(output);
-        mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
+        output = call_program_and_get_last_line_of_output(command);
         mr_free(command);
     }
@@ -346 +346 @@
         mr_asprintf(command, "dirname %s 2> /dev/null", output);
         mr_free(output);
-        mr_asprintf(output, "%s", call_program_and_get_last_line_of_output(command));
+        output = call_program_and_get_last_line_of_output(command);
         mr_free(command);
     }
@@ -428 +428 @@
     for (i = NOOF_ERR_LINES - 1; i >= 0 && !strstr(err_log_lines[i], "% Done") && !strstr(err_log_lines[i], "% done"); i--);
     if (i < 0) {
-        mr_asprintf(command, "tail -n3 %s | grep -Fi \"%c\" | tail -n1 | awk '{print $0;}'", filename, '%');
-        mr_asprintf(lastline, "%s", call_program_and_get_last_line_of_output(command));
+        mr_asprintf(command, "tail -n3 %s | grep -Fi %% | tail -n1 | awk '{print $0;}'", filename);
+        lastline = call_program_and_get_last_line_of_output(command);
         mr_free(command);
         if (!lastline[0]) {
@@ -722 +722 @@
 
     log_it(command);
-    mr_asprintf(sz_res, "%s", call_program_and_get_last_line_of_output(command));
+    sz_res = call_program_and_get_last_line_of_output(command);
     file_len_K = atol(sz_res);
     log_msg(4, "%s --> %s --> %ld", command, sz_res, file_len_K);
@@ -779 +779 @@
                     mr_asprintf(command, "ntfsresize --force --info %s|grep '^You might resize at '|cut -d' ' -f5", fname);
                     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);
 
@@ -1030 +1030 @@
     }
 
-    mr_asprintf(tmp, "%s", call_program_and_get_last_line_of_output("which mondorestore"));
+    tmp = call_program_and_get_last_line_of_output("which mondorestore");
     if (!tmp[0]) {
         mr_free(tmp);
@@ -1101 +1101 @@
     /* BERLIOS : there is a bug #67 here as it only considers the first NIC */
     mr_asprintf(command, "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
-    mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+    netfs_dev = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f7 | cut -d':' -f2");
-    mr_asprintf(netfs_client_ipaddr, "%s", call_program_and_get_last_line_of_output(command));
+    netfs_client_ipaddr = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f9 | cut -d':' -f2");
-    mr_asprintf(netfs_client_netmask, "%s", call_program_and_get_last_line_of_output(command));
+    netfs_client_netmask = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
     mr_asprintf(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\\n' | head -n1 | tr -s '\t' ' ' | cut -d' ' -f8 | cut -d':' -f2");
-    mr_asprintf(netfs_client_broadcast, "%s", call_program_and_get_last_line_of_output(command));
+    netfs_client_broadcast = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
     mr_asprintf(command, "%s", "route -n | grep '^0.0.0.0' | awk '{print $2}'");
-    mr_asprintf(netfs_client_defgw, "%s", call_program_and_get_last_line_of_output(command));
+    netfs_client_defgw = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -1136 +1136 @@
         log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
         mr_asprintf(command, "%s", "ifconfig %s | awk '{print $5}' | head -n1", netfs_dev);
-        mr_asprintf(mac_addr, "%s", call_program_and_get_last_line_of_output(command));
+        mac_addr = call_program_and_get_last_line_of_output(command);
         mr_free(command);
 
@@ -1143 +1143 @@
         mr_free(netfs_dev);
 
-        mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
+        netfs_dev = call_program_and_get_last_line_of_output(command);
         mr_free(command);