Changeset 2713 in MondoRescue

Timestamp:

Feb 2, 2011, 12:35:51 PM (14 years ago)

Author:

Bruno Cornec

Message:

• Fix #444. mondoarchive now supports inclusion/exclusion of dirs with spaces in their name. this required a syntax change for the -E/-I options where the list of dirs needs to be separated by '|' now instead of ' '.

Location:

branches/2.2.9/mondo/src/common

Files:

• libmondo-cli.c (modified) (5 diffs)
• libmondo-devices-EXT.h (modified) (1 diff)
• libmondo-devices.c (modified) (9 diffs)
• libmondo-devices.h (modified) (1 diff)
• libmondo-filelist.c (modified) (10 diffs)

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

@@ -277 +277 @@
         }
         if (bkpinfo->include_paths[0]) {
-            strcat(bkpinfo->include_paths, " ");
+            strcat(bkpinfo->include_paths, "|");
         }
 
@@ -286 +286 @@
         /* Cut the flag_val['I'] in parts containing all paths to test them */
         while (p != NULL) {
-            q = strchr(p, ' ');
+            q = strchr(p, '|');
             if (q != NULL) {
                 *q = '\0';
@@ -612 +612 @@
             log_to_screen("Please supply a sensible value with '-E'\n");
         }
-        mr_strcat(bkpinfo->exclude_paths, " ");
         mr_asprintf(&tmp1, "%s", flag_val['E']);
 
@@ -620 +619 @@
         /* Cut the flag_val['E'] in parts containing all paths to test them */
         while (p != NULL) {
-            q = strchr(p, ' ');
+            q = strchr(p, '|');
             if (q != NULL) {
                 *q = '\0';
@@ -655 +654 @@
     if ((flag_set['N']) && (! bkpinfo->restore_data))       // exclude Network mounts & devices
     {
-        mr_asprintf(&psz, "%s", list_of_NETFS_mounts_only());
-        mr_strcat(bkpinfo->exclude_paths, "%s ", psz);
-        mr_free(psz);
+        psz = list_of_NETFS_mounts_only();
+        log_msg(5, "-N means we'll exclude %s", psz);
+        if (bkpinfo->exclude_paths) {
+            mr_strcat(bkpinfo->exclude_paths, "|%s", psz);
+            mr_free(psz);
+        } else {
+            bkpinfo->exclude_paths = psz;
+        }
 
         if (bkpinfo->exclude_paths != NULL) {

branches/2.2.9/mondo/src/common/libmondo-devices-EXT.h

@@ -46 +46 @@
 extern int eject_device(char *);
 
-extern char *list_of_NETFS_devices_and_mounts();
 extern char *list_of_NETFS_mounts_only(void);
 

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

@@ -2016 +2016 @@
             log_msg (4, "%s is mounted on %s and is on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*included_dsf_list, DSFptr->mount_point);
-            strcat(*included_dsf_list, " ");
+            strcat(*included_dsf_list, "|");
         } else {
             log_msg (4, "%s is mounted on %s and is NOT on disk %s", DSFptr->device, DSFptr->mount_point, ndsf);
             strcat(*excluded_dsf_list, DSFptr->mount_point);
-            strcat(*excluded_dsf_list, " ");
+            strcat(*excluded_dsf_list, "|");
         }
         DSFptr = DSFptr->next;
@@ -2043 +2043 @@
 char *mounted_on_dsf = NULL;
 char *not_mounted_on_dsf = NULL;
-char token_chars[] =" \t\r\f\a\0\n";
+char token_chars[] ="|\t\r\f\a\0\n";
 char *tmp = NULL;
 char *tmp1 = NULL;
@@ -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);
-                mr_strcat(bkpinfo->exclude_paths, " %s ",mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_devs, " %s ",token);
+                if (bkpinfo->exclude_paths) {
+                    mr_strcat(bkpinfo->exclude_paths,"|%s",mounted_on_dsf);
+                } else {
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",mounted_on_dsf);
+                }
+                if (bkpinfo->exclude_devs) {
+                    mr_strcat(bkpinfo->exclude_devs,"|%s",token);
+                } else {
+                    mr_asprintf(bkpinfo->exclude_devs,"%s",token);
+                }
             }
         } else {
@@ -2075 +2083 @@
                 log_to_screen("Not archiving the following file systems:");
                 log_to_screen("==> %s", not_mounted_on_dsf);
-                mr_strcat(bkpinfo->exclude_paths, " %s ", not_mounted_on_dsf);
+                if (bkpinfo->exclude_paths) {
+                    mr_strcat(bkpinfo->exclude_paths, "|%s",not_mounted_on_dsf);
+                } else {
+                    mr_asprintf(bkpinfo->exclude_paths,"%s",not_mounted_on_dsf);
+                }
             }
         }
@@ -2085 +2097 @@
     /* A device special file was not passed in. Process it as a path. */
     case -1:
-        /* we need to add a space efore and after token to be sure our strstr test works correctly */
-        mr_asprintf(&tmp1," %s ",token);
+        /*  Adds a | to ensure correct detection even at both ends */
+        mr_asprintf(&tmp1,"|%s",token);
         if (mode == 'E') {
             /*  Add the token if not already in the list */
-            mr_asprintf(&tmp," %s ",bkpinfo->exclude_paths);
+            mr_asprintf(&tmp,"|%s|",bkpinfo->exclude_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                mr_strcat(bkpinfo->exclude_paths, tmp1);
+                if (bkpinfo->exclude_paths) {
+                    mr_strcat(bkpinfo->exclude_paths,tmp1);
+                    mr_free(tmp1);
+                } else {
+                    bkpinfo->exclude_paths = tmp1;
+                }
             }
         } else {
             /*  Add the token if not already in the list */
-            mr_asprintf(&tmp," %s ",bkpinfo->include_paths);
+            mr_asprintf(&tmp,"|%s|",bkpinfo->include_paths);
             if (strstr(tmp,tmp1) == NULL) {
-                strcat(bkpinfo->include_paths, tmp1);
-            }
+                strcat(bkpinfo->include_paths,tmp1);
+            }
+            mr_free(tmp1);
         }
         mr_free(tmp);
-        mr_free(tmp1);
         break;
     }
@@ -2648 +2665 @@
         if (!popup_and_get_string
             ("Backup paths",
-             "Please enter paths which you want me to backup. The default is '/' (i.e. everything).",
+             "Please enter paths (separated by '|') which you want me to backup. The default is '/' (i.e. everything).",
              bkpinfo->include_paths, MAX_STR_LEN)) {
             log_to_screen("User has chosen not to backup the PC");
             finish(1);
         }
-        mr_asprintf(&tmp, "%s", list_of_NETFS_mounts_only());
+        tmp = list_of_NETFS_mounts_only();
         if (strlen(tmp) > 2) {
-            mr_strcat(bkpinfo->exclude_paths, " %s",tmp);
+            mr_strcat(bkpinfo->exclude_paths, "|%s",tmp);
         }
         mr_free(tmp);
@@ -2672 +2689 @@
 
         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);
+        popup_and_get_string("Exclude paths", "Please enter paths which you do NOT want to backup. Separate them with '|'. 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");
@@ -2756 +2773 @@
     /*  the mr_make_devlist_from_pathlist function appends 
      *  to the *_paths variables so copy before */
-    mr_asprintf(&tmp, "%s ", bkpinfo->exclude_paths);
-    mr_make_devlist_from_pathlist(tmp, 'E');
-    mr_free(tmp);
-    mr_asprintf(&tmp, "%s ", bkpinfo->include_paths);
-    mr_make_devlist_from_pathlist(tmp, 'I');
-    mr_free(tmp);
+    mr_make_devlist_from_pathlist(bkpinfo->exclude_paths, 'E');
+    mr_make_devlist_from_pathlist(bkpinfo->include_paths, 'I');
 
     log_it("scratchdir = '%s'", bkpinfo->scratchdir);
@@ -2785 +2798 @@
 
 
-
-
-/**
- * @addtogroup utilityGroup
- * @{
- */
-/**
- * Get a space-separated list of NETFS devices and mounts.
+/**
+ * Get a |-separated list of NETFS mounts.
  * @return The list created.
- * @note The return value points to static data that will be overwritten with each call.
- */
-char *list_of_NETFS_devices_and_mounts(void)
-{
-    char *exclude_these_devices = NULL;
+ * @note The return value points to allocated string that needs to be freed
+ * @bug Even though we only want the mounts, the devices are still checked.
+ */
+char *list_of_NETFS_mounts_only(void)
+{
     char *exclude_these_directories = NULL;
-    static char result_sz[1024];
-
-    mr_asprintf(&exclude_these_directories,"%s",list_of_NETFS_mounts_only());
-    mr_asprintf(&exclude_these_devices,"%s", call_program_and_get_last_line_of_output("tr -s '\t' ' ' < /etc/fstab | grep -E '( (coda|ncpfs|sshfs|nfs|nfs4|smbfs|cifs|afs|gfs|ocfs|ocfs2|mvfs|nsspool|nsvol) )' | cut -d' ' -f1 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    snprintf(result_sz, 1023, "%s %s", exclude_these_directories, exclude_these_devices);
-    mr_free(exclude_these_devices);
-    mr_free(exclude_these_directories);
-    return (result_sz);
-}
-
-
-
-
-/**
- * Get a space-separated list of NETFS mounts.
- * @return The list created.
- * @note The return value points to static data that will be overwritten with each call.
- * @bug Even though we only want the mounts, the devices are still checked.
- */
-char *list_of_NETFS_mounts_only(void)
-{
-    char *exclude_these_directories = NULL;
-    static char result_sz[512];
-
-    mr_asprintf(&exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' ' ' | awk '{print $0;}'"));
-    snprintf(result_sz, 511, "%s", exclude_these_directories);
-    mr_free(exclude_these_directories);
-    return (result_sz);
+
+    mr_asprintf(&exclude_these_directories,"%s", call_program_and_get_last_line_of_output("mount -t coda,ncpfs,fuse.sshfs,nfs,nfs4,smbfs,cifs,afs,gfs,ocfs,ocfs2,mvfs,nsspool,nssvol | tr -s '\t' ' ' | cut -d' ' -f3 | tr -s '\n' '|' | awk '{print $0;}'"));
+    log_msg(9,"list_of_NETFS_mounts_only returns %s\n",exclude_these_directories);
+    return(exclude_these_directories);
 }
 

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

@@ -38 +38 @@
 int eject_device(char *);
 
-char *list_of_NETFS_devices_and_mounts();
 char *list_of_NETFS_mounts_only();
 

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

@@ -1295 +1295 @@
     mr_asprintf(&sz_res, "%s", incoming);
     p = sz_res;
-    while ((*p != ' ' || in_quotes) && *p != '\0') {
+    while ((*p != '|' || in_quotes) && *p != '\0') {
         if (*p == '\"') {
             in_quotes = !in_quotes;
@@ -1326 +1326 @@
                       time_t time_of_last_full_backup)
 {
-    const char delims[] = " ";
+    const char delims[] = "|";
 
     DIR *dip;
@@ -1336 +1336 @@
     static int percentage = 0;
     char *skip_these;
-    char *new_with_spaces;
+    char *new_with_pipe;
     char *strtmp;
     char *token;
@@ -1434 +1434 @@
 
 //  log_msg(0, "Cataloguing %s", dir);
-    if (sth[0] == ' ') {
-        mr_asprintf(&skip_these, "%s", sth);
-    } else {
-        mr_asprintf(&skip_these, " %s ", sth);
-    }
-    mr_asprintf(&new_with_spaces, " %s ", dir1);
+    mr_asprintf(&skip_these, "|%s|", sth);
+    
+    mr_asprintf(&new_with_pipe, "|%s|", dir1);
     if ((dip = opendir(dir1)) == NULL) {
         mr_asprintf(&tmp,"opendir %s", dir1);
         log_OS_error(tmp);
         paranoid_free(tmp);
-    } else if (strstr(skip_these, new_with_spaces)) {
+    } else if (strstr(skip_these, new_with_pipe)) {
         log_msg(10, "Found dir ***%s**** excluded", dir1);
         fprintf(fout, "%s\n", dir1);    // if excluded dir then print dir ONLY
@@ -1457 +1454 @@
                 mr_asprintf(&new,"%s%s",dir1,dit->d_name);
             }
-            paranoid_free(new_with_spaces);
-            mr_asprintf(&new_with_spaces, " %s ", new);
-            if (strstr(skip_these, new_with_spaces)) {
+            paranoid_free(new_with_pipe);
+            mr_asprintf(&new_with_pipe, "|%s|", new);
+            if (strstr(skip_these, new_with_pipe)) {
                 fprintf(fout, "%s\n", new);
                 log_msg(10, "Found child dir ***%s**** excluded", new);
-                paranoid_free(new_with_spaces);
+                paranoid_free(new_with_pipe);
             } else {
-                paranoid_free(new_with_spaces);
+                paranoid_free(new_with_pipe);
                 if (!lstat(new, &statbuf)) {
                     if (!S_ISLNK(statbuf.st_mode)
@@ -1497 +1494 @@
         }
     }
-    paranoid_free(new_with_spaces);
+    paranoid_free(new_with_pipe);
     paranoid_free(skip_these);
     mr_free(dir);
@@ -1538 +1535 @@
     char *p, *q;
     char *sz_datefile;
-    char *sz_filelist, *exclude_paths, *tmp;
+    char *sz_filelist, *tmp;
+    char *exclude_paths = NULL;
     int i;
     FILE *fout;
@@ -1549 +1547 @@
     malloc_string(tmp);
     malloc_string(g_skeleton_filelist);
-    if (!(exclude_paths = malloc(8*MAX_STR_LEN))) {
-        fatal_error("Cannot malloc exclude_paths");
-    }
     mr_asprintf(&sz_datefile,MONDO_CACHE"/difflevel.%d" , 0);
     if (!include_paths && !userdef_filelist) {
@@ -1619 +1614 @@
         paranoid_free(tmp1);
 
-        snprintf(exclude_paths, (size_t)8*MAX_STR_LEN," %s %s %s %s %s . .. \
-" MNT_CDROM " " MNT_FLOPPY " /media /tmp \
-/proc /sys /dev/shm " MINDI_CACHE, MONDO_CACHE, excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
+        mr_asprintf(&exclude_paths, MONDO_CACHE"|%s|%s|%s|%s|.|..|"MNT_CDROM"|"MNT_FLOPPY"|/media|/tmp|/proc|/sys|/dev/shm|"MINDI_CACHE,excp, tmp2, (tmpdir[0] == '/' && tmpdir[1] == '/') ? (tmpdir + 1) : tmpdir, (scratchdir[0] == '/' && scratchdir[1] == '/') ? (scratchdir + 1) : scratchdir);
         paranoid_free(tmp2);
 
@@ -1648 +1641 @@
                 p += strlen(q);
                 paranoid_free(q);
-                while (*p == ' ') {
+                while (*p == '|') {
                     p++;
                 }