Changeset 2697 in MondoRescue

Timestamp:

Jan 25, 2011, 10:44:33 AM (14 years ago)

Author:

Bruno Cornec

Message:

• Backport from 2.2.10 the support of a dynamic exclude_path variable. Should help fix #366, #421, #368, #443. To be tested.

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-archive.c (modified) (1 diff)
• libmondo-cli.c (modified) (2 diffs)
• libmondo-devices.c (modified) (6 diffs)
• libmondo-tools.c (modified) (2 diffs)
• mondostructures.h (modified) (1 diff)
• newt-specific.c (modified) (3 diffs)

branches/2.2.9/mondo/src/common/libmondo-archive.c

@@ -13 +13 @@
 #include "my-stuff.h"
 #include "mr_mem.h"
+#include "mr_str.h"
 #include "mondostructures.h"
 #include "libmondo-string-EXT.h"

branches/2.2.9/mondo/src/common/libmondo-cli.c

@@ -612 +612 @@
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        if (bkpinfo->exclude_paths[0]) {
-            strcat(bkpinfo->exclude_paths, " ");
-        }
+        mr_strcat(bkpinfo->exclude_paths, " ");
         mr_asprintf(&tmp1, "%s", flag_val['E']);
 
@@ -658 +656 @@
     {
         mr_asprintf(&psz, "%s", list_of_NETFS_mounts_only());
-        if (bkpinfo->exclude_paths[0]) {
-            strncat(bkpinfo->exclude_paths, " ", 4*MAX_STR_LEN);
-        }
-        strncat(bkpinfo->exclude_paths, psz, 4*MAX_STR_LEN);
+        mr_strcat(bkpinfo->exclude_paths, "%s ", psz);
         mr_free(psz);
 
-        log_msg(3, "-N means we're now excluding %s",
-                bkpinfo->exclude_paths);
-    }
-
-    if (strlen(bkpinfo->exclude_paths) >= 4*MAX_STR_LEN) {
-        fatal_error
-            ("Your '-E' parameter is too long. Increase MAX_STR_LEN");
+        if (bkpinfo->exclude_paths != NULL) {
+            log_msg(3, "-N means we're now excluding %s", bkpinfo->exclude_paths);
+        }
     }
 

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

@@ -2064 +2064 @@
                 log_to_screen("==> %s", mounted_on_dsf);
                 log_msg (5, "Adding to bkpinfo->exclude_paths due to -E option: %s", mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, " ");
-                strcat(bkpinfo->exclude_paths, mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, " ");
+                mr_strcat(bkpinfo->exclude_paths, " %s ",mounted_on_dsf);
                 mr_strcat(bkpinfo->exclude_devs, " %s ",token);
             }
@@ -2077 +2075 @@
                 log_to_screen("Not archiving the following file systems:");
                 log_to_screen("==> %s", not_mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, " ");
-                strcat(bkpinfo->exclude_paths, not_mounted_on_dsf);
-                strcat(bkpinfo->exclude_paths, " ");
+                mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf);
             }
         }
@@ -2095 +2091 @@
             mr_asprintf(&tmp," %s ",bkpinfo->exclude_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                strcat(bkpinfo->exclude_paths, tmp1);
+                mr_strcat(bkpinfo->exclude_paths, tmp1);
             }
         } else {
@@ -2141 +2137 @@
     char *tmp1 = NULL;
     char *mds = NULL;
+    char p[8*MAX_STR_LEN];
     char *sz_size;
     char *command;
@@ -2658 +2655 @@
         mr_asprintf(&tmp, "%s", list_of_NETFS_mounts_only());
         if (strlen(tmp) > 2) {
-            if (bkpinfo->exclude_paths[0]) {
-                strcat(bkpinfo->exclude_paths, " ");
-            }
-            strncpy(bkpinfo->exclude_paths, tmp, MAX_STR_LEN);
+            mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
         }
         mr_free(tmp);
@@ -2677 +2671 @@
         }
 
-
-        if (!popup_and_get_string
-            ("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, (4*MAX_STR_LEN)-1)) {
+        strncpy(p,bkpinfo->exclude_paths,(8*MAX_STR_LEN)-1);
+        popup_and_get_string("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.", p, (8*MAX_STR_LEN)-1);
+        if (p == NULL) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        /* Always needs to be finished by a space */
-        if (bkpinfo->exclude_paths[0]) {
-            strcat(bkpinfo->exclude_paths, " ");
-        }
+        mr_free(bkpinfo->exclude_paths);
+        mr_asprintf(&tmp, "%s", p);
+        bkpinfo->exclude_paths = tmp;
+
         if (!popup_and_get_string
             ("Temporary directory",

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

@@ -787 +787 @@
     bkpinfo->make_filelist = TRUE;  // unless -J supplied to mondoarchive
     bkpinfo->include_paths[0] = '\0';
-    bkpinfo->exclude_paths[0] = '\0';
     bkpinfo->exclude_devs = NULL;
     bkpinfo->restore_path[0] = '\0';
@@ -799 +798 @@
     bkpinfo->netfs_user = NULL;
     bkpinfo->netfs_remote_dir[0] = '\0';
+    bkpinfo->exclude_paths = NULL;
     bkpinfo->postnuke_tarball[0] = '\0';
     bkpinfo->wipe_media_first = FALSE;

branches/2.2.9/mondo/src/common/mondostructures.h

@@ -522 +522 @@
    * the scratchdir, and the tempdir are automatically excluded.
    */
-    char exclude_paths[MAX_STR_LEN*4];
+    char *exclude_paths;
 
   /**

branches/2.2.9/mondo/src/common/newt-specific.c

@@ -432 +432 @@
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->tmpdir);
                 system(command);
-                paranoid_free(command);
+                mr_free(command);
             }
         }
@@ -441 +441 @@
                 mr_asprintf(&command, "rm -Rf %s", bkpinfo->scratchdir);
                 system(command);
-                paranoid_free(command);
+                mr_free(command);
             }
         }
@@ -448 +448 @@
         mr_free(bkpinfo->netfs_proto);
         mr_free(bkpinfo->exclude_devs);
+        mr_free(bkpinfo->exclude_paths);
 
         /* Then free the structure */