Changeset 839 in MondoRescue for trunk/mondo/src/common/libmondo-filelist.c

Timestamp:

Sep 26, 2006, 9:47:32 AM (18 years ago)

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

File:

• trunk/mondo/src/common/libmondo-filelist.c (modified) (4 diffs)

trunk/mondo/src/common/libmondo-filelist.c

@@ -17 +17 @@
 #include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
-
+#include "mr_string.h"
 
 #include <time.h>
@@ -1318 +1318 @@
                       char *skeleton_filelist)
 {
+    const char delims[] = " ";
     DIR *dip = NULL;
     struct dirent *dit = NULL;
+
     struct stat statbuf;
     char *new = NULL;
@@ -1329 +1331 @@
     static char *name_of_evalcall_form = NULL;
     int i = 0;
+    char *strtmp = NULL;
+    char *token = NULL;
+    char *find_excludes = NULL;
+    int lastpos = 0;
     static int depth = 0;
     char *p = NULL;
@@ -1347 +1353 @@
     if (!depth) {
         malloc_string(find_skeleton_marker);
+        asprintf(&find_excludes, " ");
+        while((token = mr_strtok (sth, delims, &lastpos))) {
+          asprintf(&strtmp,"%s", find_excludes);
+          paranoid_free(find_excludes);
+          asprintf(&find_excludes,"%s -path %s -prune -o", strtmp, token);
+          paranoid_free(strtmp);
+          paranoid_free(token);
+        }
 #if linux
         // 2.6 has /sys as a proc-type thing -- must be excluded
-        asprintf(&tmp,
-                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -path /sys -prune -o -path /dev/shm -prune -o -path /media/floppy -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+        asprintf(&strtmp,
+             "find %s -maxdepth %d -fstype mvfs -prune -o -path /dev/shm -prune -o %s -type d -print > %s 2> /dev/null",
+             dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
 #else
         // On BSD, for example, /sys is the kernel sources -- don't exclude
-        asprintf(&tmp,
-                "find %s -maxdepth %d -fstype mvfs -prune -o -fstype afs -prune -o -path /proc -prune -o -type d -a -print > %s 2> /dev/null",
-                 dir, MAX_SKEL_DEPTH, skeleton_filelist);
+        asprintf(&strtmp,
+             "find %s -maxdepth %d -fstype mvfs -prune -o -path /proc -prune -o %s -type d -print > %s 2> /dev/null",
+                dir, MAX_SKEL_DEPTH, find_excludes, g_skeleton_filelist);
+>>>>>>> .merge-right.r838
 #endif
-        system(tmp);
+        paranoid_free(find_excludes);
+        log_msg(5, "find command = %s", strtmp);
+        system(strtmp);
+        paranoid_free(strtmp);
         paranoid_free(tmp);