Changeset 2436 in MondoRescue for branches/2.2.9/mondo/src/common/libmondo-filelist.c

Timestamp:

Sep 29, 2009, 1:48:32 AM (15 years ago)

Author:

Bruno Cornec

Message:

• Improve deplist.d/* files
• adds libnss for ssh support in boot disk
• Solve a memory management issue in DSF module (strtok => mr_strtok)
• DSF now also supports partitions in addition to full disks
• Adds debug in open_and_list_dir

File:

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

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

@@ -1350 +1350 @@
     /* dir is needed when we pass it to the shell */
     dir = mr_stresc(dir1, "`$\\\"(){}'[]&*?|!#~", '\\');
-    p = strrchr(dir, '/');
+    p = strrchr(dir1, '/');
     if (p) {
         if (!strcmp(p, "/.") || !strcmp(p, "/..")) {
@@ -1404 +1404 @@
                     g_skeleton_filelist, g_skeleton_filelist);
 //        log_msg(6, "fsm = %s", find_skeleton_marker);
-            run_program_and_log_output(find_skeleton_marker, 8);
+            paranoid_system(find_skeleton_marker);
             time(&this_time);
             if (this_time != last_time) {
@@ -1434 +1434 @@
         paranoid_free(tmp);
     } else if (strstr(skip_these, new_with_spaces)) {
+        log_msg(10, "Found dir ***%s**** excluded", dir1);
         fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
     } else {
+        log_msg(10, "Found dir ***%s**** parsed", dir1);
         fprintf(fout, "%s\n", dir1);
         while ((dit = readdir(dip)) != NULL) {
@@ -1448 +1450 @@
             if (strstr(skip_these, new_with_spaces)) {
                 fprintf(fout, "%s\n", new);
+                log_msg(10, "Found child dir ***%s**** excluded", new);
                 paranoid_free(new_with_spaces);
             } else {
@@ -1454 +1457 @@
                     if (!S_ISLNK(statbuf.st_mode)
                         && S_ISDIR(statbuf.st_mode)) {
+                        log_msg(10, "Found child dir ***%s**** parsed", new);
                         open_and_list_dir(new, skip_these, fout,
                                           time_of_last_full_backup);
@@ -1460 +1464 @@
                             || time_of_last_full_backup <
                             statbuf.st_ctime) {
+                            log_msg(10, "Found child file ***%s**** parsed", new);
                             fprintf(fout, "%s\n", new);
                             if ((counter++) > 128) {