added --backup-dir option from Bob Edwards

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index ae9f8b1..fefe299 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -27,50 +27,6 @@ extern int delete_mode;
 
 static struct exclude_struct **exclude_list;
 
-/*
- * Optimization for special case when all included files are explicitly
- *   listed without wildcards in the "exclude" list followed by a "- *"
- *   to exclude the rest.
- * Contributed by Dave Dykstra <dwd@bell-labs.com>
- */
-static int only_included_files = 1;
-static struct exclude_struct *exclude_the_rest;
-
-int send_included_file_names(int f,struct file_list *flist)
-{
-       struct exclude_struct *ex, **ex_list;
-       int n;
-       char *p;
-
-       if (!only_included_files || (exclude_the_rest == NULL) || delete_mode)
-               return 0;
-
-       if (verbose > 1) {
-               rprintf(FINFO,"(using include-only optimization) ");
-       }
-
-       /* set exclude_list to NULL temporarily so check_exclude */
-       /*   will always return true */
-       ex_list = exclude_list;
-       exclude_list = NULL;
-       for (n=0; (ex = ex_list[n]) != NULL; n++) {
-               if (ex == exclude_the_rest)
-                       break;
-               p = ex->pattern;
-               while (*p == '/') {
-                       /* skip the allowed beginning slashes */
-                       p++;
-               }
-               /* silently skip files that don't exist to
-                  be more like non-optimized case */
-               if (access(p,0) == 0)
-                       send_file_name(f,flist,p,0,0);
-       }
-       exclude_list = ex_list;
-       
-       return 1;
-}
-
 /* build an exclude structure given a exclude pattern */
 static struct exclude_struct *make_exclude(char *pattern, int include)
 {
@@ -95,15 +51,8 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
        if (!ret->pattern) out_of_memory("make_exclude");
 
        if (strpbrk(pattern, "*[?")) {
-           if (!ret->include && (*pattern == '*') && (*(pattern+1) == '\0')) {
-                   exclude_the_rest = ret;
-           } else {
-                   only_included_files = 0;
-           }
            ret->regular_exp = 1;
            ret->fnmatch_flags = strstr(pattern, "**") ? 0 : FNM_PATHNAME;
-       } else if (!ret->include) {
-               only_included_files = 0;
        }
 
        if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') {
@@ -199,8 +148,6 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include)
                }
                free((*list));
                *list = NULL;
-               only_included_files = 1;
-               exclude_the_rest = NULL;
                return;
        }
 
@@ -270,8 +217,11 @@ void send_exclude_list(int f)
        }
 
        for (i=0;exclude_list[i];i++) {
-               char *pattern = exclude_list[i]->pattern; 
                int l;
+               char pattern[MAXPATHLEN];
+
+               strlcpy(pattern,exclude_list[i]->pattern,sizeof(pattern)); 
+               if (exclude_list[i]->directory) strlcat(pattern,"/", sizeof(pattern));
 
                l = strlen(pattern);
                if (l == 0) continue;
@@ -303,14 +253,62 @@ void recv_exclude_list(int f)
        }
 }
 
+/* Get the next include/exclude arg from the string. It works in a similar way
+** to strtok - initially an arg is sent over, from then on NULL. This
+** routine takes into account any +/- in the strings and does not
+** consider the space following it as a delimeter.
+*/
+char *get_exclude_tok(char *p)
+{
+       static char *s;
+       static int more;
+       char *t;
+
+       if (p) {
+               s=p;
+               if (*p)
+                       more=1;
+       }
+
+       if (!more)
+               return(NULL);
 
+       /* Skip over any initial spaces */
+       while(isspace(*s))
+               s++;
+
+       /* Are we at the end of the string? */
+       if (*s) {
+               /* remember the beginning of the token */
+               t=s;
+
+               /* Is this a '+' or '-' followed by a space (not whitespace)? */
+               if ((*s=='+' || *s=='-') && *(s+1)==' ')
+                       s+=2;
+       
+               /* Skip to the next space or the end of the string */
+               while(!isspace(*s) && *s!='\0')
+                       s++;
+       } else {
+               t=NULL;
+       }
+
+       /* Have we reached the end of the string? */
+       if (*s)
+               *s++='\0';
+       else
+               more=0;
+       return(t);
+}
+
+       
 void add_exclude_line(char *p)
 {
        char *tok;
        if (!p || !*p) return;
        p = strdup(p);
        if (!p) out_of_memory("add_exclude_line");
-       for (tok=strtok(p," "); tok; tok=strtok(NULL," "))
+       for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL))
                add_exclude(tok, 0);
        free(p);
 }
@@ -321,7 +319,7 @@ void add_include_line(char *p)
        if (!p || !*p) return;
        p = strdup(p);
        if (!p) out_of_memory("add_include_line");
-       for (tok=strtok(p," "); tok; tok=strtok(NULL," "))
+       for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL))
                add_exclude(tok, 1);
        free(p);
 }