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

[rsync/rsync.git] / exclude.c

diff --git a/exclude.c b/exclude.c
index 9c18365..35fa307 100644 (file)
--- a/exclude.c
+++ b/exclude.c
@@ -77,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) {
@@ -90,7 +88,7 @@ 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 (!ret->pattern) out_of_memory("make_exclude");
 
        if (strpbrk(pattern, "*[?")) {
            if (!ret->include && (*pattern == '*') && (*(pattern+1) == '\0')) {
@@ -117,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);
@@ -163,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))
@@ -224,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;
        }
@@ -259,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);
        }    
 
@@ -306,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.*",
@@ -326,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);
        }