Changeset 2320 in MondoRescue for branches/2.2.10/mondo/src/common/libmondo-filelist.c

Timestamp:

Aug 18, 2009, 2:37:39 PM (15 years ago)

Author:

Bruno Cornec

Message:

r3331@localhost: bruno | 2009-08-06 01:34:32 +0200

• bkpinfo->scratchdir is now dynamically allocated
• mondoarchive tests made in text+newt env. Seems OK. Valgrind errors to be fixed

File:

• branches/2.2.10/mondo/src/common/libmondo-filelist.c (modified) (12 diffs)

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

@@ -1296 +1296 @@
 
     assert(bkpinfo != NULL);
-    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir,
-           bkpinfo->scratchdir);
+    log_it("tmpdir=%s; scratchdir=%s", bkpinfo->tmpdir, bkpinfo->scratchdir);
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
@@ -1308 +1307 @@
     if (bkpinfo->make_filelist) {
         res =
-            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir,
-                               bkpinfo->scratchdir, bkpinfo->include_paths,
-                               bkpinfo->exclude_paths,
-                               bkpinfo->differential, NULL);
+            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);
+            mondo_makefilelist(MONDO_LOGFILE, bkpinfo->tmpdir, bkpinfo->scratchdir, NULL, bkpinfo->exclude_paths, bkpinfo->differential, bkpinfo->include_paths);
     }
 
@@ -1382 +1374 @@
         malloc_string(find_skeleton_marker);
         mr_asprintf(&find_excludes, " ");
-        while((token = mr_strtok (sth, delims, &lastpos))) {
-          mr_asprintf(&strtmp,"%s", find_excludes);
-          paranoid_free(find_excludes);
-          mr_asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
-          paranoid_free(strtmp);
-          mr_free(token);
+        if (sth != NULL) {
+            while((token = mr_strtok(sth, delims, &lastpos))) {
+                mr_strcat(find_excludes," -path %s -prune -o", token);
+            }
         }
 #if linux
@@ -1396 +1386 @@
         mr_asprintf(&strtmp, "find '%s' -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null", dir, find_excludes, g_skeleton_filelist);
 #endif
-        paranoid_free(find_excludes);
+        mr_free(find_excludes);
+
         log_msg(5, "find command = %s", strtmp);
         (void)system(strtmp);
-        paranoid_free(strtmp);
+        mr_free(strtmp);
+
         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));
-        paranoid_free(tmp);
+        g_skeleton_entries = 1 + atol(call_program_and_get_last_line_of_output(tmp));
+        mr_free(tmp);
+
         sprintf(name_of_evalcall_form, "Making catalog of %s", dir);
         open_evalcall_form(name_of_evalcall_form);
@@ -1415 +1407 @@
                 "grep -Fv '%s' %s > %s.new 2> /dev/null", dir,
                 g_skeleton_filelist, g_skeleton_filelist);
-//    log_msg(0, "fsm = %s", find_skeleton_marker);
         if (!system(find_skeleton_marker)) {
             percentage = (int) (skeleton_lino * 100 / g_skeleton_entries);
             skeleton_lino++;
-//        log_msg(5, "Found %s", dir);
-//        log_msg(2, "Incrementing skeleton_lino; now %ld/%ld (%d%%)", skeleton_lino, g_skeleton_entries, percentage);
             sprintf(find_skeleton_marker, "mv -f %s.new %s",
                     g_skeleton_filelist, g_skeleton_filelist);
-//        log_msg(6, "fsm = %s", find_skeleton_marker);
             run_program_and_log_output(find_skeleton_marker, 8);
             time(&this_time);
@@ -1570 +1558 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist, *exclude_paths, *tmp;
+    char *sz_filelist;
+    char *exclude_paths = NULL;
+    char *tmp;
     int i;
     FILE *fout;
@@ -1581 +1571 @@
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
     mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
@@ -1637 +1624 @@
         mr_free(command);
     } else {
-        log_msg(2, "include_paths = '%s'", include_paths);
+        if (include_paths) {
+            log_msg(2, "include_paths = '%s'", include_paths);
+        }
         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}'"));
@@ -1649 +1638 @@
             log_msg(2, "Found windows files: %s",tmp2);
         }
-        paranoid_free(tmp1);
-
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media /tmp \
-/proc /sys " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
-        paranoid_free(tmp2);
+        mr_free(tmp1);
+
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s . ..  " MNT_CDROM " " MNT_FLOPPY " /media /tmp  /proc /sys " MINDI_CACHE, MONDO_CACHE, (excp == NULL) ? "" : excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_free(tmp2);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);
-        log_msg(2,
-                "Generating skeleton filelist so that we can track our progress");
+        log_msg(2, "Generating skeleton filelist so that we can track our progress");
         sprintf(g_skeleton_filelist, "%s/tmpfs/skeleton.txt", tmpdir);
         make_hole_for_file(g_skeleton_filelist);
@@ -1667 +1653 @@
         }
         i = 0;
-        if (strlen(include_paths) == 0) {
+        if ((!include_paths) || (strlen(include_paths) == 0)) {
             log_msg(1, "Including only '/' in %s", sz_filelist);
             open_and_list_dir("/", exclude_paths, fout,
@@ -1685 +1671 @@
             }
         }
+        mr_free(exclude_paths);
         paranoid_fclose(fout);
     }
@@ -1702 +1689 @@
     paranoid_free(sz_filelist);
     log_msg(2, "Freeing variables");
-    paranoid_free(exclude_paths);
     paranoid_free(tmp);
     paranoid_free(g_skeleton_filelist);