Changeset 1855


Ignore:
Timestamp:
Jan 11, 2008, 11:22:18 AM (11 years ago)
Author:
bruno
Message:

try to fix a recently introduced core dumped

Location:
branches/2.2.5/mondo/src/common
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mondo/src/common/libmondo-filelist.c

    r1854 r1855  
    17521752        log_msg(2, "include_paths = '%s'", include_paths);
    17531753        log_msg(1, "Calculating filelist");
    1754         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' ' '"));
     1754        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}'"));
    17551755        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s %s . .. \
    17561756" MNT_CDROM " " MNT_FLOPPY " /media \
  • branches/2.2.5/mondo/src/common/libmondo-tools.c

    r1854 r1855  
    11651165
    11661166    // abort if Windows partition but no ms-sys and parted
    1167     if (!run_program_and_log_output
    1168         ("mount | grep -w vfat | grep -vE \"/dev/fd|nexdisk\"", 0)
    1169         ||
    1170         !run_program_and_log_output
    1171         ("mount | grep -w dos | grep -vE \"/dev/fd|nexdisk\"", 0)) {
     1167    if (!run_program_and_log_output("mount | grep -Ew 'vfat|fat|dos' | grep -vE \"/dev/fd|nexdisk\"", 0)) {
    11721168        log_to_screen("I think you have a Windows 9x partition.");
    11731169        retval += whine_if_not_found("parted");
Note: See TracChangeset for help on using the changeset viewer.