Changeset 1540 in MondoRescue

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)

Location:

branches/2.2.5/mondo/src

Files:

• common/libmondo-devices.c (modified) (1 diff)
• common/libmondo-filelist.c (modified) (2 diffs)
• mondoarchive/mondo-cli.c (modified) (1 diff)

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

@@ -2325 +2325 @@
             ("Exclude paths",
              "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.",
-             bkpinfo->exclude_paths, MAX_STR_LEN)) {
+             bkpinfo->exclude_paths, (4*MAX_STR_LEN)-1)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);

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);

branches/2.2.5/mondo/src/mondoarchive/mondo-cli.c

@@ -725 +725 @@
         strncpy(psz, list_of_NFS_mounts_only(), MAX_STR_LEN);
         if (bkpinfo->exclude_paths[0]) {
-            strncat(bkpinfo->exclude_paths, " ", MAX_STR_LEN);
-        }
-        strncat(bkpinfo->exclude_paths, psz, MAX_STR_LEN);
+            strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
+        }
+        strncat(bkpinfo->exclude_paths, psz, 4*MAX_STR_LEN);
         log_msg(3, "-N means we're now excluding %s",
                 bkpinfo->exclude_paths);
     }
-    if (strlen(bkpinfo->exclude_paths) >= MAX_STR_LEN) {
+    if (strlen(bkpinfo->exclude_paths) >= 4*MAX_STR_LEN) {
         fatal_error
-            ("Your '-E' parameter is too long. Please use '-J'. (See manual.)");
+            ("Your '-E' parameter is too long. Increase MAX_STR_LEN");
     }
     if (flag_set['b']) {