Changeset 1855 in MondoRescue

Timestamp:

Jan 11, 2008, 11:22:18 AM (16 years ago)

Author:

Bruno Cornec

Message:

try to fix a recently introduced core dumped

Location:

branches/2.2.5/mondo/src/common

Files:

• libmondo-filelist.c (modified) (1 diff)
• libmondo-tools.c (modified) (1 diff)

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

@@ -1752 +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' ' '"));
+        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|dos' | awk '{print $3}'"));
         snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \

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

@@ -1165 +1165 @@
 
     // abort if Windows partition but no ms-sys and parted
-    if (!run_program_and_log_output
-        ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
-        ||
-        !run_program_and_log_output
-        ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
+    if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -vE \"/dev/fd|nexdisk\"", 0)) {
         log_to_screen("I think you have a Windows 9x partition.");
         retval += whine_if_not_found("parted");