X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a6536635e3680d53d9a370b8c7f122d5d94a98fa..8fcdc444dfebb21fd535ef567f0900026cc4756d:/exclude.c

diff --git a/exclude.c b/exclude.c
index 252affeb..b48d674d 100644
--- a/exclude.c
+++ b/exclude.c
@@ -34,7 +34,7 @@ extern int recurse;
 extern char curr_dir[];
 
 struct exclude_list_struct exclude_list = { 0, 0, "" };
-struct exclude_list_struct local_exclude_list = { 0, 0, "local-cvsignore " };
+struct exclude_list_struct local_exclude_list = { 0, 0, "per-dir .cvsignore " };
 struct exclude_list_struct server_exclude_list = { 0, 0, "server " };
 char *exclude_path_prefix = NULL;
 
@@ -103,11 +103,6 @@ void free_exclude_list(struct exclude_list_struct *listp)
 {
 	struct exclude_struct *ent, *next;
 
-	if (verbose > 2) {
-		rprintf(FINFO, "[%s] clearing %sexclude list\n",
-			who_am_i(), listp->debug_type);
-	}
-
 	for (ent = listp->head; ent; ent = next) {
 		next = ent->next;
 		free_exclude(ent);
@@ -236,8 +231,8 @@ int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir
 /* Get the next include/exclude arg from the string.  The token will not
  * be '\0' terminated, so use the returned length to limit the string.
  * Also, be sure to add this length to the returned pointer before passing
- * it back to ask for the next token.  This routine will not split off a
- * prefix of "+ " or "- " unless xflags contains XFLG_NO_PREFIXES.  The
+ * it back to ask for the next token.  This routine will not parse the +/-
+ * prefixes or the "!" token when xflags contains XFLG_WORDS_ONLY.  The
  * *incl_ptr value will be 1 for an include, 0 for an exclude, and -1 for
  * the list-clearing "!" token.
  */
@@ -256,7 +251,7 @@ static const char *get_exclude_tok(const char *p, int *len_ptr, int *incl_ptr,
 	}
 
 	/* Is this a '+' or '-' followed by a space (not whitespace)? */
-	if (!(xflags & XFLG_NO_PREFIXES)
+	if (!(xflags & XFLG_WORDS_ONLY)
 	    && (*s == '-' || *s == '+') && s[1] == ' ') {
 		*incl_ptr = *s == '+';
 		s += 2;
@@ -272,7 +267,7 @@ static const char *get_exclude_tok(const char *p, int *len_ptr, int *incl_ptr,
 	} else
 		len = strlen(s);
 
-	if (*p == '!' && len == 1 && !(xflags & XFLG_NO_PREFIXES))
+	if (*p == '!' && len == 1 && !(xflags & XFLG_WORDS_ONLY))
 		*incl_ptr = -1;
 
 	*len_ptr = len;
@@ -296,9 +291,14 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern,
 		if (!pat_len)
 			break;
 		/* If we got the special "!" token, clear the list. */
-		if (incl < 0)
+		if (incl < 0) {
+			if (verbose > 2) {
+				rprintf(FINFO,
+					"[%s] clearing %sexclude list\n",
+					who_am_i(), listp->debug_type);
+			}
 			free_exclude_list(listp);
-		else {
+		} else {
 			make_exclude(listp, cp, pat_len, incl);
 
 			if (verbose > 2) {
@@ -316,7 +316,7 @@ void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
 		      int xflags)
 {
 	FILE *fp;
-	char line[MAXPATHLEN];
+	char line[MAXPATHLEN+3]; /* Room for "x " prefix and trailing slash. */
 	char *eob = line + MAXPATHLEN - 1;
 	int word_split = xflags & XFLG_WORD_SPLIT;
 
@@ -340,7 +340,7 @@ void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
 
 	while (1) {
 		char *s = line;
-		int ch;
+		int ch, overflow = 0;
 		while (1) {
 			if ((ch = getc(fp)) == EOF) {
 				if (ferror(fp) && errno == EINTR)
@@ -353,10 +353,16 @@ void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
 				break;
 			if (s < eob)
 				*s++ = ch;
+			else
+				overflow = 1;
+		}
+		if (overflow) {
+			rprintf(FERROR, "discarding over-long exclude: %s...\n", line);
+			s = line;
 		}
 		*s = '\0';
-		/* Skip lines starting with semicolon or pound. */
-		if (*line && *line != ';' && *line != '#')
+		/* Skip an empty token and (when line parsing) comments. */
+		if (*line && (word_split || (*line != ';' && *line != '#')))
 			add_exclude(listp, line, xflags);
 		if (ch == EOF)
 			break;
@@ -405,7 +411,7 @@ void send_exclude_list(int f)
 
 void recv_exclude_list(int f)
 {
-	char line[MAXPATHLEN+1]; /* Allows a trailing slash on a max-len dir */
+	char line[MAXPATHLEN+3]; /* Room for "x " prefix and trailing slash. */
 	unsigned int l;
 
 	while ((l = read_int(f)) != 0) {
@@ -433,14 +439,14 @@ void add_cvs_excludes(void)
 	char *p;
 
 	add_exclude(&exclude_list, default_cvsignore,
-		    XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+		    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
 
 	if ((p = getenv("HOME"))
 	    && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname) {
 		add_exclude_file(&exclude_list, fname,
-				 XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+				 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
 	}
 
 	add_exclude(&exclude_list, getenv("CVSIGNORE"),
-		    XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+		    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
 }