Changeset 3205 in MondoRescue for branches/3.2/mondo/src/common/libmondo-filelist.c

Timestamp:

Dec 6, 2013, 3:40:47 PM (10 years ago)

Author:

Bruno Cornec

Message:

• Fix mondoarchive which now works in text mode. GUI mode still not working and crashing on first update for backup. Needs more

investigation in newt-specific.c

File:

• branches/3.2/mondo/src/common/libmondo-filelist.c (modified) (6 diffs)

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

@@ -1302 +1302 @@
     struct dirent *dit;
     struct stat statbuf;
-    char *new;
+    char *new = NULL;
     char *tmp = NULL;
     char *dir = NULL;
     static int percentage = 0;
     char *skip_these = NULL;
-    char *new_with_pipe;
+    char *new_with_pipe = NULL;
     char *strtmp = NULL;
     char *token = NULL;
@@ -1395 +1395 @@
         mr_free(find_skeleton_marker);
     }
+    mr_free(dir);
 
     depth++;
 
-//  log_msg(0, "Cataloguing %s", dir);
     mr_asprintf(skip_these, "|%s|", sth);
     
@@ -1455 +1455 @@
     mr_free(new_with_pipe);
     mr_free(skip_these);
-    mr_free(dir);
 
     if (dip) {
@@ -1583 +1582 @@
         if ((include_paths != NULL) && (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
-            open_and_list_dir("/", exclude_paths, fout,
-                              time_of_last_full_backup);
+            open_and_list_dir("/", exclude_paths, fout, time_of_last_full_backup);
         } else {
             p = include_paths;
@@ -1590 +1588 @@
                 q = next_entry(p);
                 log_msg(1, "Including %s in filelist %s", q, sz_filelist);
-                open_and_list_dir(q, exclude_paths, fout,
-                                  time_of_last_full_backup);
+                open_and_list_dir(q, exclude_paths, fout, time_of_last_full_backup);
                 p += strlen(q);
                 paranoid_free(q);
@@ -1652 +1649 @@
 
     if (bkpinfo->make_filelist) {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, bkpinfo->include_paths,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential, NULL);
+        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, bkpinfo->include_paths, bkpinfo->exclude_paths, bkpinfo->differential, NULL);
     } else {
-        res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, NULL,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential,
-                               bkpinfo->include_paths);
+        res = mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }