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

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

@@ -276 +276 @@
 
     if (!kernel[0]) {
-        strcpy(kernel, call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null"));
+        tmp = call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null");
+        strcpy(kernel, tmp);
+        mr_free(tmp);
     }
     // If we didn't get anything back, check whether mindi raised a fatal error
     if (!kernel[0]) {
         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);
         if (strlen(tmp) > 1) {
             popup_and_OK(tmp);
@@ -334 +336 @@
     assert_string_is_neither_NULL_nor_zerolength(fname);
     mr_asprintf(command, "which %s 2> /dev/null", fname);
-    mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
+    incoming = call_program_and_get_last_line_of_output(command);
     mr_free(command);
 
@@ -346 +348 @@
         mr_free(incoming);
 
-        mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
+        incoming = call_program_and_get_last_line_of_output(command);
         mr_free(command);
     }
@@ -353 +355 @@
         mr_free(incoming);
 
-        mr_asprintf(incoming, "%s", call_program_and_get_last_line_of_output(command));
+        mr_free(command);
+        incoming = call_program_and_get_last_line_of_output(command);
         mr_free(command);
     }
@@ -435 +438 @@
     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));
+        lastline = call_program_and_get_last_line_of_output(command);
         mr_free(command);
         if (!lastline[0]) {
@@ -730 +733 @@
 
     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);
@@ -786 +789 @@
                     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);
 
@@ -1059 +1062 @@
     mr_free(command);
 
-    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);
@@ -1089 +1092 @@
 
     mvaddstr_and_log_it(g_currentY++, 74, "Done.");
-}
-
-
-/**
- * Store the client's NETFS configuration in files to be restored at restore-time.
- * Assumes that @c bkpinfo->media_type = netfs, but does not check for this.
- * @param bkpinfo The backup information structure. Fields used:
- * - @c netfs_mount
- * - @c tmpdir
- */
-void store_netfs_config()
-{
-
-    /*@ buffers ******** */
-    char *netfs_dev = NULL;
-    char *netfs_client_hwaddr = NULL;
-    char *command = NULL;
-
-    /********
-    * If the Network device found above is a bonded device, 
-    * we need to replace it with an ethN device or the
-    * networking will not start during an Network restore.
-    *
-    * If the Network device in netfs_dev begins with the word "bond", or alb or aft
-    * look for the corresponding slave ethN device and copy it to netfs_dev.
-    * Using the common MAC address
-    ********/
-    if (!strncmp(netfs_dev, "bond", 4) || !strncmp(netfs_dev, "alb", 3) || !strncmp(netfs_dev, "aft", 3)) {
-        log_to_screen("Found bonding device %s; looking for corresponding ethN slave device\n", netfs_dev);
-        mr_asprintf(command, "ifconfig | grep -E '%s' | grep -v '%s' | head -n1 | cut -d' ' -f1",netfs_client_hwaddr,netfs_dev);
-        mr_asprintf(netfs_dev, "%s", call_program_and_get_last_line_of_output(command));
-        mr_free(command);
-        log_to_screen("Replacing it with %s\n", netfs_dev);
-    }
-
-    log_it("Finished storing Network configuration");
 }