Always include "." when processing exclude lists. This avoids confusion

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index ab01234..35fa307 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -26,6 +26,47 @@ extern int verbose;
 
 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))
+               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++;
+               }
+               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)
 {
@@ -36,8 +77,6 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
 
        memset(ret, 0, sizeof(*ret));
 
-       ret->orig = strdup(pattern);
-
        if (strncmp(pattern,"- ",2) == 0) {
                pattern += 2;
        } else if (strncmp(pattern,"+ ",2) == 0) {
@@ -49,9 +88,18 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
 
        ret->pattern = strdup(pattern);
 
-       if (!ret->orig || !ret->pattern) out_of_memory("make_exclude");
-
-       if (strpbrk(pattern, "*[?")) ret->regular_exp = 1;
+       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;
+       } else if (!ret->include) {
+               only_included_files = 0;
+       }
 
        if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') {
                ret->pattern[strlen(pattern)-1] = 0;
@@ -67,7 +115,6 @@ static struct exclude_struct *make_exclude(char *pattern, int include)
 
 static void free_exclude(struct exclude_struct *ex)
 {
-       free(ex->orig);
        free(ex->pattern);
        memset(ex,0,sizeof(*ex));
        free(ex);
@@ -113,6 +160,10 @@ int check_exclude(char *name,struct exclude_struct **local_exclude_list,
 {
        int n;
 
+       if (name && (name[0] == '.') && !name[1])
+               /* never exclude '.', even if somebody does --exclude '*' */
+               return 0;
+
        if (exclude_list) {
                for (n=0; exclude_list[n]; n++)
                        if (check_one_exclude(name,exclude_list[n],st))
@@ -143,14 +194,12 @@ 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;
        }
 
-       if (!*list) {
-               *list = (struct exclude_struct **)malloc(sizeof(struct exclude_struct *)*2);
-       } else {
-               *list = (struct exclude_struct **)realloc(*list,sizeof(struct exclude_struct *)*(len+2));
-       }
+       *list = (struct exclude_struct **)Realloc(*list,sizeof(struct exclude_struct *)*(len+2));
        
        if (!*list || !((*list)[len] = make_exclude(pattern, include)))
                out_of_memory("add_exclude");
@@ -176,7 +225,7 @@ struct exclude_struct **make_exclude_list(char *fname,
        if (!f) {
                if (fatal) {
                        rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
-                       exit_cleanup(1);
+                       exit_cleanup(RERR_FILEIO);
                }
                return list;
        }
@@ -211,23 +260,21 @@ void send_exclude_list(int f)
        }
 
        for (i=0;exclude_list[i];i++) {
-               char *pattern = exclude_list[i]->orig; 
+               char *pattern = exclude_list[i]->pattern; 
                int l;
 
-               if (remote_version < 19) {
-                       if (strncmp(pattern,"+ ", 2)==0) {
+               l = strlen(pattern);
+               if (l == 0) continue;
+               if (exclude_list[i]->include) {
+                       if (remote_version < 19) {
                                rprintf(FERROR,"remote rsync does not support include syntax - aborting\n");
-                               exit_cleanup(1);
-                       }
-                       
-                       if (strncmp(pattern,"- ", 2) == 0) {
-                               pattern += 2;
+                               exit_cleanup(RERR_UNSUPPORTED);
                        }
+                       write_int(f,l+2);
+                       write_buf(f,"+ ",2);
+               } else {
+                       write_int(f,l);
                }
-               
-               l = strlen(pattern);
-               if (l == 0) continue;
-               write_int(f,l);
                write_buf(f,pattern,l);
        }    
 
@@ -258,6 +305,17 @@ void add_exclude_line(char *p)
        free(p);
 }
 
+void add_include_line(char *p)
+{
+       char *tok;
+       if (!p || !*p) return;
+       p = strdup(p);
+       if (!p) out_of_memory("add_include_line");
+       for (tok=strtok(p," "); tok; tok=strtok(NULL," "))
+               add_exclude(tok, 1);
+       free(p);
+}
+
 
 static char *cvs_ignore_list[] = {
   "RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*",
@@ -278,7 +336,7 @@ void add_cvs_excludes(void)
                add_exclude(cvs_ignore_list[i], 0);
 
        if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
-               slprintf(fname,sizeof(fname)-1, "%s/.cvsignore",p);
+               slprintf(fname,sizeof(fname), "%s/.cvsignore",p);
                add_exclude_file(fname,0,0);
        }