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

Timestamp:

Jul 20, 2007, 1:28:27 AM (17 years ago)

Author:

Bruno Cornec

Message:

exclude_path should be 4*MAX_STR_LEN everywhere. Fixed now.
Increasing that value will allow to having larger exclude paths.
Should solve bug #137 (and maybe #3 as well)

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 @@
     malloc_string(sz_filelist);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(1000))) {
+    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
         fatal_error("Cannot malloc exclude_paths");
     }
@@ -1749 +1749 @@
         log_msg(2, "include_paths = '%s'", include_paths);
         log_msg(1, "Calculating filelist");
-        sprintf(exclude_paths, " %s %s %s %s %s %s . .. \
+        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s %s . .. \
 " MNT_CDROM " " MNT_FLOPPY " /media \
 /proc /sys /root/images/mondo " MINDI_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);