Changeset 1903 in MondoRescue for branches/stable/mondo/src/common/libmondo-filelist.c

Timestamp:

Apr 10, 2008, 1:13:58 AM (16 years ago)

Author:

Bruno Cornec

Message:

merge -r 1842:1889 2.2.5

File:

• branches/stable/mondo/src/common/libmondo-filelist.c (modified) (2 diffs)

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

@@ -1527 +1527 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
+    char *tmp1 = NULL;
+    char *tmp2 = NULL;
 
     malloc_string(sz_datefile);
@@ -1586 +1588 @@
         mr_msg(2, "include_paths = '%s'", include_paths);
         mr_msg(1, "Calculating filelist");
-        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s %s . .. \
-" MNT_CDROM " /mnt/floppy /media \
-/proc /sys /tmp /var/log/lastlog /root/images/mondo " MINDI_CACHE " " MONDO_CACHE, excp, call_program_and_get_last_line_of_output("locate /win386.swp 2> /dev/null"), call_program_and_get_last_line_of_output("locate /hiberfil.sys 2> /dev/null"), call_program_and_get_last_line_of_output("locate /pagefile.sys 2> /dev/null"), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(&tmp2, call_program_and_get_last_line_of_output("mount | grep -Ew 'ntfs|fat|vfat|dos' | awk '{print $3}'"));
+        if (strlen(tmp2) < 1) {
+            mr_asprintf(&tmp1,"");
+        } else {
+            mr_msg(2, "Found windows FS: %s",tmp2);
+            mr_asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",tmp2);
+            mr_free(tmp2);
+            mr_asprintf(&tmp2, call_program_and_get_last_line_of_output(tmp1));
+            mr_msg(2, "Found windows files: %s",tmp2);
+        }
+        mr_free(tmp1);
 
         mr_msg(2, "Excluding paths = '%s'", exclude_paths);
+        mr_asprintf(&exclude_paths, " %s %s %s %s %s %s . .. \
+" MNT_CDROM " " MNT_FLOPPY " /media /tmp /var/log/lastlog \
+/proc /sys /root/images/mondo ", MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_free(tmp2);
+
         mr_msg(2,
                 "Generating skeleton filelist so that we can track our progress");