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

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

@@ -861 +861 @@
     mr_asprintf(tmp1, "zcat %s | wc -l", filelist_fname);
     log_msg(6, "tmp1 = %s", tmp1);
-    lines_in_filelist = atol(call_program_and_get_last_line_of_output(tmp1));
+    tmp = call_program_and_get_last_line_of_output(tmp1);
+    lines_in_filelist = atol(tmp);
+    mr_free(tmp);
     mr_free(tmp1);
 
@@ -1302 +1304 @@
     char *new = NULL;
     char *tmp = NULL;
+    char *tmp2 = NULL;
     char *dir = NULL;
     static int percentage = 0;
@@ -1358 +1361 @@
 
         mr_asprintf(tmp, "wc -l %s | awk '{print $1;}'", g_skeleton_filelist);
-        g_skeleton_entries = 1 + atol(call_program_and_get_last_line_of_output(tmp));
+        tmp2 = call_program_and_get_last_line_of_output(tmp);
+        g_skeleton_entries = 1 + atol(tmp2);
+        mr_free(tmp2);
         mr_free(tmp);
 
@@ -1523 +1528 @@
         }
         make_hole_for_file(sz_datefile);
-        write_one_liner_data_file(sz_datefile,
-                                  call_program_and_get_last_line_of_output
-                                  ("date +%s"));
+        tmp2 = call_program_and_get_last_line_of_output("date +%s");
+        write_one_liner_data_file(sz_datefile, tmp2);
+        mr_free(tmp2);
     } else if (lstat(sz_datefile, &statbuf)) {
         log_msg(2, "Warning - unable to find date of previous backup. Full backup instead.");
@@ -1550 +1555 @@
         }
         log_msg(1, "Calculating filelist");
-        mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'"));
+        tmp2 = call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|ntfs-3g|fat|vfat|dos' | awk '{print $3}'");
         if (strlen(tmp2) < 1) {
             mr_asprintf(tmp1," ");
@@ -1557 +1562 @@
             mr_asprintf(tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
             mr_free(tmp2);
-            mr_asprintf(tmp2, "%s", call_program_and_get_last_line_of_output(tmp1));
+            tmp2 = call_program_and_get_last_line_of_output(tmp1);
             log_msg(2, "Found windows files: %s",tmp2);
         }