Changeset 1854 in MondoRescue for branches/2.2.5/mondo/src/common/libmondo-filelist.c

Timestamp:

Jan 11, 2008, 10:58:11 AM (16 years ago)

Author:

Bruno Cornec

Message:

removal of locate usage completely from code to use findw!

File:

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

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

@@ -1696 +1696 @@
     time_t time_of_last_full_backup = 0;
     struct stat statbuf;
+    char *tmp1 = NULL;
 
     malloc_string(command);
@@ -1751 +1752 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
+        asprintf(&tmp1, "find %s -name '/win386.swp' -o -name '/hiberfil.sys' -o -name '/pagefile.sys' 2> /dev/null\n",call_program_and_get_last_line_of_output("mount |  grep -Ew 'ntfs|fat|vfat' | awk '{print $3}' | tr '\n' ' '"));
         snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
-/proc /sys /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);
+/proc /sys /root/images/mondo " MINDI_CACHE, MONDO_CACHE, excp, call_program_and_get_last_line_of_output(tmp1), (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        paranoid_free(tmp1);
 
         log_msg(2, "Excluding paths = '%s'", exclude_paths);