Changeset 3190 in MondoRescue for branches/3.1/mondo/src/common/libmondo-files.c

Timestamp:

Sep 25, 2013, 8:55:43 AM (11 years ago)

Author:

Bruno Cornec

Message:

• Modification to 3.1 branch to make it extremely similar to 3.0. What remains are function rewrite with allocation in the function and desallocation outside of the function. Will be next step

File:

• branches/3.1/mondo/src/common/libmondo-files.c (modified) (16 diffs)

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

@@ -145 +145 @@
     fin = popen(command, "r");
     mr_free(command);
+
     if (fin) {
         if (feof(fin)) {
@@ -216 +217 @@
     assert_string_is_neither_NULL_nor_zerolength(inout);
     mr_asprintf(infname, "%s.in", inout);
-    mr_asprintf(outfname, "%s", inout);
     mr_asprintf(tmp, "cp -f %s %s", inout, infname);
     run_program_and_log_output(tmp, FALSE);
@@ -226 +226 @@
         return;
     }
+
+    mr_asprintf(outfname, "%s", inout);
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error("Unable to openout outfname");
+        mr_free(infname);
         mr_free(outfname);
         return;
@@ -252 +255 @@
     mr_free(infname);
 }
-
-
-
-
-
-
-
 
 
@@ -271 +267 @@
 
     char *tmp = NULL;
-    char *command = NULL;;
-    char *kernel = NULL;;
+    char *command = NULL;
+    char *kernel = NULL;
 
     kernel = call_program_and_get_last_line_of_output("mindi --findkernel 2> /dev/null",TRUE);
@@ -308 +304 @@
 
 
-
-
-
-
 /**
  * Find location of specified executable in user's PATH.
@@ -358 +350 @@
     return (output);
 }
-
-
-
-
-
-
 
 
@@ -659 +645 @@
     return (0);
 }
-
-
 
 
@@ -1028 +1012 @@
         fatal_error("Failed to copy LAST-FILELIST-NUMBER to scratchdir");
     }
+    mr_free(command);
 
     tmp = call_program_and_get_last_line_of_output("which mondorestore",TRUE);
@@ -1099 +1084 @@
 
     /* 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(command, "%s", "ifconfig | tr '\n' '#' | sed s/##// | tr '#' ' ' | tr '' '\n' | head -n1 | cut -d' ' -f1");
     netfs_dev = call_program_and_get_last_line_of_output(command,TRUE);
     mr_free(command);
@@ -1119 +1104 @@
     mr_free(command);
 
+    mr_asprintf(command, "ifconfig %s | head -1 | awk '{print $5}'", netfs_dev);
+    netfs_client_hwaddr = call_program_and_get_last_line_of_output(command);
+    mr_free(command);
+
+    log_it("netfs_client_hwaddr=%s; netfs_client_ipaddr=%s; netfs_server_ipaddr=%s; netfs_mount=%s", netfs_client_hwaddr, netfs_client_ipaddr, netfs_server_ipaddr, netfs_mount);
     if (strlen(netfs_dev) < 2) {
         fatal_error("Unable to find ethN (eth0, eth1, ...) adapter via Network mount you specified.");
@@ -1124 +1114 @@
 
     /********
-    * If the Network device that found above is a bonded device, 
+    * 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.
@@ -1153 +1143 @@
     mr_free(tmp);
 
-    mr_asprintf(tmp, "%s/NETFS-SERVER-MOUNT", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, bkpinfo->netfs_mount);
-    mr_free(tmp);
-    mr_free(netfs_mount);
+    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, netfs_client_hwaddr);
+    mr_free(netfs_client_hwaddr);
+    mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_ipaddr);
-    mr_free(tmp);
-
-    mr_asprintf(tmp, "%s/NETFS-CLIENT-HWADDR", bkpinfo->tmpdir);
-    write_one_liner_data_file(tmp, netfs_client_hwaddr);
+    mr_free(netfs_client_ipaddr);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-NETMASK", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_netmask);
+    mr_free(netfs_client_netmask);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-BROADCAST", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_broadcast);
+    mr_free(netfs_client_broadcast);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-CLIENT-DEFGW", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_client_defgw);
+    mr_free(netfs_client_defgw);
     mr_free(tmp);
 
     mr_asprintf(tmp, "%s/NETFS-SERVER-IPADDR", bkpinfo->tmpdir);
     write_one_liner_data_file(tmp, netfs_server_ipaddr);
+    mr_free(netfs_server_ipaddr);
     mr_free(tmp);
 
@@ -1198 +1189 @@
     write_one_liner_data_file(tmp, bkpinfo->prefix);
     mr_free(tmp);
+
+    sprintf(tmp, "%s/NETFS-PROTO", bkpinfo->tmpdir);
+    write_one_liner_data_file(tmp, bkpinfo->netfs_proto);
+    mr_free(tmp);
+
 
     log_it("Finished storing Network configuration");
@@ -1228 +1224 @@
     long long scratchLL;
 
-    if (bkpinfo->media_size[1] <= 0) {
+    if (bkpinfo->media_size <= 0) {
         log_to_screen("Number of media required: UNKNOWN");
         return;
@@ -1234 +1230 @@
 
     log_it("Estimating number of media required...");
-    scratchLL =
-        (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size)
-        + (long long) (size_of_all_biggiefiles_K());
-    scratchLL = (scratchLL / 1024) / bkpinfo->media_size[1];
+    scratchLL = (long long) (noof_sets) * (long long) (bkpinfo->optimal_set_size) + (long long) (size_of_all_biggiefiles_K());
+    scratchLL = (scratchLL / 1024) / bkpinfo->media_size;
     scratchLL++;
     if (bkpinfo->use_lzo) {