Changeset 839 in MondoRescue for trunk/mondo/src/common

Timestamp:

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

Author:

Bruno Cornec

Message:

merge -r814:838 $SVN_M/branches/stable

Location:

trunk/mondo/src/common

Files:

• Makefile.am (modified) (1 diff)
• libmondo-devices.c (modified) (1 diff)
• libmondo-filelist.c (modified) (4 diffs)
• libmondo-files.c (modified) (1 diff)
• libmondo-raid.c (modified) (1 diff)
• mr_string.c (copied) (copied from branches/stable/mondo/mondo/common/mr_string.c )
• mr_string.h (copied) (copied from branches/stable/mondo/mondo/common/mr_string.h )

trunk/mondo/src/common/Makefile.am

@@ -8 +8 @@
 
 libmondo_a_SOURCES  = libmondo-archive.c libmondo-devices.c libmondo-fifo.c \
-                    libmondo-filelist.c libmondo-files.c libmondo-fork.c \
-                    libmondo-mountlist.c libmondo-raid.c libmondo-msg.c \
-                    libmondo-stream.c libmondo-string.c libmondo-tools.c \
-                    libmondo-verify.c newt-specific.c \
-                    libmondo-archive.h libmondo-devices.h \
-                    libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                    libmondo-mountlist.h libmondo-raid.h \
-                    libmondo-stream.h libmondo-string.h libmondo-tools.h \
-                    libmondo-verify.h libmondo-fifo.h \
-                    libmondo-archive-EXT.h my-stuff.h mondostructures.h \
-                    libmondo-devices-EXT.h libmondo-fifo-EXT.h \
-                    libmondo-files-EXT.h libmondo-fork-EXT.h \
-                    libmondo-filelist-EXT.h \
-                    libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
-                    libmondo-string-EXT.h libmondo-tools-EXT.h \
-                    libmondo-verify-EXT.h  libmondo-stream-EXT.h \
-                    newt-specific.h
+                    libmondo-msg.c \
+                       libmondo-filelist.c libmondo-files.c libmondo-fork.c \
+                       libmondo-mountlist.c libmondo-raid.c \
+                       libmondo-stream.c libmondo-string.c libmondo-tools.c \
+                       libmondo-verify.c newt-specific.c \
+                       libmondo-archive.h libmondo-devices.h \
+                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
+                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
+                       libmondo-stream.h libmondo-string.h libmondo-tools.h \
+                       libmondo-verify.h libmondo-fifo.h \
+                       libmondo-archive-EXT.h my-stuff.h mondostructures.h \
+                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
+                       libmondo-files-EXT.h libmondo-fork-EXT.h \
+                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
+                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
+                       libmondo-string-EXT.h libmondo-tools-EXT.h \
+                       libmondo-verify-EXT.h  libmondo-stream-EXT.h \
+                       newt-specific.h

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

@@ -2026 +2026 @@
     asprintf(&exclude_these_devices,
            call_program_and_get_last_line_of_output
-           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|afs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
+           ("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|nfs|smbfs|cifs|mvfs) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
            */
 }

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);
 

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

@@ -772 +772 @@
 
     asprintf(&command, "du -sk %s", mountpt);
+    errno = 0;
     fin = popen(command, "r");
-    paranoid_free(command);
-
-    (void) getline(&tmp, &n, fin);
-    paranoid_pclose(fin);
-    p = strchr(tmp, '\t');
-    if (p) {
-        *p = '\0';
-    }
-    for (p = tmp, llres = 0; *p != '\0'; p++) {
-        llres *= 10;
-        llres += (int) (*p - '0');
-    }
+    if (errno) {
+      log_it("popen() FAILED: command=%s, mountpt=%s, fin=%d, errno=%d, strerror=%s", command, mountpt, fin, errno, strerror(errno));
+      llres = 0;
+    } else {
+        (void) getline(&tmp, &n, fin);
+        paranoid_pclose(fin);
+        p = strchr(tmp, '\t');
+        if (p) {
+            *p = '\0';
+        }
+        for (p = tmp, llres = 0; *p != '\0'; p++) {
+            llres *= 10;
+            llres += (int) (*p - '0');
+        }
+    }
+
+    paranoid_free(command);
     paranoid_free(tmp);
     return (llres);

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

@@ -16 +16 @@
 #include "libmondo-string-EXT.h"
 #include "libmondo-raid.h"
+#include "mr_string.h"
 
 #ifdef __FreeBSD__