X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/5f5be796b0cff5eb4da83d8f3a1bead25b6583b8..a41a1e87182410ec6c2eeaddb0cd961ec554c404:/exclude.c

diff --git a/exclude.c b/exclude.c
index d7fe9240..5c8c7f47 100644
--- a/exclude.c
+++ b/exclude.c
@@ -27,100 +27,101 @@
 #include "rsync.h"
 
 extern int verbose;
+extern int eol_nulls;
+extern int list_only;
+extern int recurse;
 
-struct exclude_struct **exclude_list;
-struct exclude_struct **local_exclude_list;
-struct exclude_struct **server_exclude_list;
+extern char curr_dir[];
+
+struct exclude_list_struct exclude_list = { 0, 0, "" };
+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;
 
-/** Build an exclude structure given a exclude pattern */
-static struct exclude_struct *make_exclude(const char *pattern, int include)
+/** Build an exclude structure given an exclude pattern. */
+static void make_exclude(struct exclude_list_struct *listp, const char *pat,
+			 unsigned int pat_len, unsigned int mflags)
 {
 	struct exclude_struct *ret;
-	char *cp;
-	int pat_len;
+	const char *cp;
+	unsigned int ex_len;
 
 	ret = new(struct exclude_struct);
-	if (!ret) out_of_memory("make_exclude");
+	if (!ret)
+		out_of_memory("make_exclude");
 
 	memset(ret, 0, sizeof ret[0]);
 
-	if (strncmp(pattern,"- ",2) == 0) {
-		pattern += 2;
-	} else if (strncmp(pattern,"+ ",2) == 0) {
-		ret->include = 1;
-		pattern += 2;
-	} else {
-		ret->include = include;
-	}
-
 	if (exclude_path_prefix)
-		ret->match_flags |= MATCHFLG_ABS_PATH;
-	if (exclude_path_prefix && *pattern == '/') {
-		ret->pattern = new_array(char,
-			strlen(exclude_path_prefix) + strlen(pattern) + 1);
-		if (!ret->pattern) out_of_memory("make_exclude");
-		sprintf(ret->pattern, "%s%s", exclude_path_prefix, pattern);
-	}
-	else {
-		ret->pattern = strdup(pattern);
-		if (!ret->pattern) out_of_memory("make_exclude");
-	}
-
-	if (strpbrk(pattern, "*[?")) {
-		ret->match_flags |= MATCHFLG_WILD;
-		if (strstr(pattern, "**")) {
-			ret->match_flags |= MATCHFLG_WILD2;
+		mflags |= MATCHFLG_ABS_PATH;
+	if (exclude_path_prefix && *pat == '/')
+		ex_len = strlen(exclude_path_prefix);
+	else
+		ex_len = 0;
+	ret->pattern = new_array(char, ex_len + pat_len + 1);
+	if (!ret->pattern)
+		out_of_memory("make_exclude");
+	if (ex_len)
+		memcpy(ret->pattern, exclude_path_prefix, ex_len);
+	strlcpy(ret->pattern + ex_len, pat, pat_len + 1);
+	pat_len += ex_len;
+
+	if (strpbrk(ret->pattern, "*[?")) {
+		mflags |= MATCHFLG_WILD;
+		if ((cp = strstr(ret->pattern, "**")) != NULL) {
+			mflags |= MATCHFLG_WILD2;
 			/* If the pattern starts with **, note that. */
-			if (*pattern == '*' && pattern[1] == '*')
-				ret->match_flags |= MATCHFLG_WILD2_PREFIX;
+			if (cp == ret->pattern)
+				mflags |= MATCHFLG_WILD2_PREFIX;
 		}
 	}
 
-	pat_len = strlen(ret->pattern);
 	if (pat_len > 1 && ret->pattern[pat_len-1] == '/') {
 		ret->pattern[pat_len-1] = 0;
-		ret->directory = 1;
+		mflags |= MATCHFLG_DIRECTORY;
 	}
 
 	for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
 		ret->slash_cnt++;
 
-	return ret;
+	ret->match_flags = mflags;
+
+	if (!listp->tail)
+		listp->head = listp->tail = ret;
+	else {
+		listp->tail->next = ret;
+		listp->tail = ret;
+	}
 }
 
 static void free_exclude(struct exclude_struct *ex)
 {
 	free(ex->pattern);
-	memset(ex, 0, sizeof ex[0]);
 	free(ex);
 }
 
-
-void free_exclude_list(struct exclude_struct ***listp)
+void clear_exclude_list(struct exclude_list_struct *listp)
 {
-	struct exclude_struct **list = *listp;
+	struct exclude_struct *ent, *next;
 
-	if (verbose > 2)
-		rprintf(FINFO, "[%s] clearing exclude list\n", who_am_i());
-
-	if (!list)
-		return;
-
-	while (*list)
-		free_exclude(*list++);
+	for (ent = listp->head; ent; ent = next) {
+		next = ent->next;
+		free_exclude(ent);
+	}
 
-	free(*listp);
-	*listp = NULL;
+	listp->head = listp->tail = NULL;
 }
 
 static int check_one_exclude(char *name, struct exclude_struct *ex,
                              int name_is_dir)
 {
-	char *p;
+	char *p, full_name[MAXPATHLEN];
 	int match_start = 0;
 	char *pattern = ex->pattern;
 
+	if (!*name)
+		return 0;
+
 	/* If the pattern does not have any slashes AND it does not have
 	 * a "**" (which could match a slash), then we just match the
 	 * name portion of the path. */
@@ -128,17 +129,14 @@ static int check_one_exclude(char *name, struct exclude_struct *ex,
 		if ((p = strrchr(name,'/')) != NULL)
 			name = p+1;
 	}
-	else if ((ex->match_flags & MATCHFLG_ABS_PATH) && *name != '/') {
-		static char full_name[MAXPATHLEN];
-		extern char curr_dir[];
-		int plus = curr_dir[1] == '\0'? 1 : 0;
-		pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
+	else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/'
+	    && curr_dir[1]) {
+		pathjoin(full_name, sizeof full_name, curr_dir + 1, name);
 		name = full_name;
 	}
 
-	if (!name[0]) return 0;
-
-	if (ex->directory && !name_is_dir) return 0;
+	if (ex->match_flags & MATCHFLG_DIRECTORY && !name_is_dir)
+		return 0;
 
 	if (*pattern == '/') {
 		match_start = 1;
@@ -150,8 +148,8 @@ static int check_one_exclude(char *name, struct exclude_struct *ex,
 	if (ex->match_flags & MATCHFLG_WILD) {
 		/* A non-anchored match with an infix slash and no "**"
 		 * needs to match the last slash_cnt+1 name elements. */
-		if (!match_start && ex->slash_cnt &&
-		    !(ex->match_flags & MATCHFLG_WILD2)) {
+		if (!match_start && ex->slash_cnt
+		    && !(ex->match_flags & MATCHFLG_WILD2)) {
 			int cnt = ex->slash_cnt + 1;
 			for (p = name + strlen(name) - 1; p >= name; p--) {
 				if (*p == '/' && !--cnt)
@@ -197,35 +195,36 @@ static int check_one_exclude(char *name, struct exclude_struct *ex,
 
 static void report_exclude_result(char const *name,
                                   struct exclude_struct const *ent,
-                                  int name_is_dir)
+                                  int name_is_dir, const char *type)
 {
 	/* If a trailing slash is present to match only directories,
 	 * then it is stripped out by make_exclude.  So as a special
 	 * case we add it back in here. */
 
 	if (verbose >= 2) {
-		rprintf(FINFO, "[%s] %s %s %s because of pattern %s%s\n",
+		rprintf(FINFO, "[%s] %scluding %s %s because of %spattern %s%s\n",
 			who_am_i(),
-			ent->include ? "including" : "excluding",
-			name_is_dir ? "directory" : "file",
-			name, ent->pattern,
-			ent->directory ? "/" : "");
+			ent->match_flags & MATCHFLG_INCLUDE ? "in" : "ex",
+			name_is_dir ? "directory" : "file", name, type,
+			ent->pattern,
+			ent->match_flags & MATCHFLG_DIRECTORY ? "/" : "");
 	}
 }
 
 
 /*
- * Return true if file NAME is defined to be excluded by either
- * LOCAL_EXCLUDE_LIST or the globals EXCLUDE_LIST.
+ * Return -1 if file "name" is defined to be excluded by the specified
+ * exclude list, 1 if it is included, and 0 if it was not matched.
  */
-int check_exclude(struct exclude_struct **list, char *name, int name_is_dir)
+int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir)
 {
 	struct exclude_struct *ent;
 
-	while ((ent = *list++) != NULL) {
+	for (ent = listp->head; ent; ent = ent->next) {
 		if (check_one_exclude(name, ent, name_is_dir)) {
-			report_exclude_result(name, ent, name_is_dir);
-			return !ent->include;
+			report_exclude_result(name, ent, name_is_dir,
+					      listp->debug_type);
+			return ent->match_flags & MATCHFLG_INCLUDE ? 1 : -1;
 		}
 	}
 
@@ -233,41 +232,101 @@ int check_exclude(struct exclude_struct **list, char *name, int name_is_dir)
 }
 
 
-void add_exclude(struct exclude_struct ***listp, const char *pattern, int include)
+/* 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 parses the "!" (list-
+ * clearing) token and (if xflags does NOT contain XFLG_WORDS_ONLY) the
+ * +/- prefixes for overriding the include/exclude mode.  The *flag_ptr
+ * value will also be set to the MATCHFLG_* bits for the current token.
+ */
+static const char *get_exclude_tok(const char *p, unsigned int *len_ptr,
+				   unsigned int *flag_ptr, int xflags)
 {
-	struct exclude_struct **list = *listp;
-	int len = 0;
+	const unsigned char *s = (const unsigned char *)p;
+	unsigned int len, mflags = 0;
 
-	if (*pattern == '!' && !pattern[1]) {
-		free_exclude_list(listp);
-		return;
+	if (xflags & XFLG_WORD_SPLIT) {
+		/* Skip over any initial whitespace. */
+		while (isspace(*s))
+			s++;
+		/* Update for "!" check. */
+		p = (const char *)s;
 	}
 
-	if (list)
-		for (; list[len]; len++) {}
+	/* Is this a '+' or '-' followed by a space (not whitespace)? */
+	if (!(xflags & XFLG_WORDS_ONLY)
+	    && (*s == '-' || *s == '+') && s[1] == ' ') {
+		if (*s == '+')
+			mflags |= MATCHFLG_INCLUDE;
+		s += 2;
+	} else if (xflags & XFLG_DEF_INCLUDE)
+		mflags |= MATCHFLG_INCLUDE;
+	if (xflags & XFLG_DIRECTORY)
+		mflags |= MATCHFLG_DIRECTORY;
+
+	if (xflags & XFLG_WORD_SPLIT) {
+		const unsigned char *cp = s;
+		/* Token ends at whitespace or the end of the string. */
+		while (!isspace(*cp) && *cp != '\0')
+			cp++;
+		len = cp - s;
+	} else
+		len = strlen(s);
+
+	if (*p == '!' && len == 1)
+		mflags |= MATCHFLG_CLEAR_LIST;
+
+	*len_ptr = len;
+	*flag_ptr = mflags;
+	return (const char *)s;
+}
+
 
- 	list = *listp = realloc_array(list, struct exclude_struct *, len+2);
+void add_exclude(struct exclude_list_struct *listp, const char *pattern,
+		 int xflags)
+{
+	unsigned int pat_len, mflags;
+	const char *cp;
 
-	if (!list || !(list[len] = make_exclude(pattern, include)))
-		out_of_memory("add_exclude");
+	if (!pattern)
+		return;
 
-	if (verbose > 2) {
-		rprintf(FINFO, "[%s] add_exclude(%s,%s)\n",
-			who_am_i(), pattern,
-			include ? "include" : "exclude");
-	}
+	cp = pattern;
+	pat_len = 0;
+	while (1) {
+		cp = get_exclude_tok(cp + pat_len, &pat_len, &mflags, xflags);
+		if (!pat_len)
+			break;
 
-	list[len+1] = NULL;
+		if (mflags & MATCHFLG_CLEAR_LIST) {
+			if (verbose > 2) {
+				rprintf(FINFO,
+					"[%s] clearing %sexclude list\n",
+					who_am_i(), listp->debug_type);
+			}
+			clear_exclude_list(listp);
+			continue;
+		}
+
+		make_exclude(listp, cp, pat_len, mflags);
+
+		if (verbose > 2) {
+			rprintf(FINFO, "[%s] add_exclude(%.*s, %s%sclude)\n",
+				who_am_i(), (int)pat_len, cp, listp->debug_type,
+				mflags & MATCHFLG_INCLUDE ? "in" : "ex");
+		}
+	}
 }
 
 
-void add_exclude_file(struct exclude_struct ***listp, const char *fname,
-		      int fatal, int include)
+void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
+		      int xflags)
 {
 	FILE *fp;
-	char line[MAXPATHLEN];
-	char *eob = line + MAXPATHLEN - 1;
-	extern int eol_nulls;
+	char line[MAXPATHLEN+3]; /* Room for "x " prefix and trailing slash. */
+	char *eob = line + sizeof line - 1;
+	int word_split = xflags & XFLG_WORD_SPLIT;
 
 	if (!fname || !*fname)
 		return;
@@ -277,10 +336,10 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 	else
 		fp = stdin;
 	if (!fp) {
-		if (fatal) {
+		if (xflags & XFLG_FATAL_ERRORS) {
 			rsyserr(FERROR, errno,
 				"failed to open %s file %s",
-				include ? "include" : "exclude",
+				xflags & XFLG_DEF_INCLUDE ? "include" : "exclude",
 				fname);
 			exit_cleanup(RERR_FILEIO);
 		}
@@ -289,25 +348,30 @@ void add_exclude_file(struct exclude_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)
 					continue;
 				break;
 			}
+			if (word_split && isspace(ch))
+				break;
 			if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
 				break;
 			if (s < eob)
 				*s++ = ch;
+			else
+				overflow = 1;
 		}
-		*s = '\0';
-		if (*line && *line != ';' && *line != '#') {
-			/* Skip lines starting with semicolon or pound.
-			 * It probably wouldn't cause any harm to not skip
-			 * them but there's no need to save them. */
-			add_exclude(listp, line, include);
+		if (overflow) {
+			rprintf(FERROR, "discarding over-long exclude: %s...\n", line);
+			s = line;
 		}
+		*s = '\0';
+		/* Skip an empty token and (when line parsing) comments. */
+		if (*line && (word_split || (*line != ';' && *line != '#')))
+			add_exclude(listp, line, xflags);
 		if (ch == EOF)
 			break;
 	}
@@ -317,141 +381,80 @@ void add_exclude_file(struct exclude_struct ***listp, const char *fname,
 
 void send_exclude_list(int f)
 {
-	int i;
-	extern int list_only, recurse;
+	struct exclude_struct *ent;
 
 	/* This is a complete hack - blame Rusty.
 	 *
 	 * FIXME: This pattern shows up in the output of
 	 * report_exclude_result(), which is not ideal. */
 	if (list_only && !recurse)
-		add_exclude(&exclude_list, "/*/*", ADD_EXCLUDE);
+		add_exclude(&exclude_list, "/*/*", 0);
 
-	if (!exclude_list) {
-		write_int(f,0);
-		return;
-	}
-
-	for (i = 0; exclude_list[i]; i++) {
+	for (ent = exclude_list.head; ent; ent = ent->next) {
 		unsigned int l;
-		char pattern[MAXPATHLEN+1];
+		char p[MAXPATHLEN+1];
 
-		l = strlcpy(pattern, exclude_list[i]->pattern, sizeof pattern);
+		l = strlcpy(p, ent->pattern, sizeof p);
 		if (l == 0 || l >= MAXPATHLEN)
 			continue;
-		if (exclude_list[i]->directory) {
-			pattern[l++] = '/';
-			pattern[l] = '\0';
+		if (ent->match_flags & MATCHFLG_DIRECTORY) {
+			p[l++] = '/';
+			p[l] = '\0';
 		}
 
-		if (exclude_list[i]->include) {
-			write_int(f,l+2);
-			write_buf(f,"+ ",2);
-		} else {
-			write_int(f,l);
-		}
-		write_buf(f,pattern,l);
+		if (ent->match_flags & MATCHFLG_INCLUDE) {
+			write_int(f, l + 2);
+			write_buf(f, "+ ", 2);
+		} else if ((*p == '-' || *p == '+') && p[1] == ' ') {
+			write_int(f, l + 2);
+			write_buf(f, "- ", 2);
+		} else
+			write_int(f, l);
+		write_buf(f, p, l);
 	}
 
-	write_int(f,0);
+	write_int(f, 0);
 }
 
 
 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) {
 		if (l >= sizeof line)
 			overflow("recv_exclude_list");
 		read_sbuf(f, line, l);
-		add_exclude(&exclude_list, line, ADD_EXCLUDE);
-	}
-}
-
-/* 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;
+		add_exclude(&exclude_list, line, 0);
 	}
-
-	if (!more)
-		return(NULL);
-
-	/* Skip over any initial spaces */
-	while (isspace(* (unsigned char *) 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(* (unsigned char *) 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(struct exclude_struct ***listp,
-		      const char *line, int include)
-{
-	char *tok, *p;
-	if (!line || !*line) return;
-	p = strdup(line);
-	if (!p) out_of_memory("add_exclude_line");
-	for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL))
-		add_exclude(listp, tok, include);
-	free(p);
 }
 
 
-static char *cvs_ignore_list[] = {
-  "RCS/", "SCCS/", "CVS/", ".svn/", "CVS.adm", "RCSLOG", "cvslog.*",
-  "tags", "TAGS", ".make.state", ".nse_depinfo",
-  "*~", "#*", ".#*", ", *", "*.old", "*.bak", "*.BAK", "*.orig",
-  "*.rej", ".del-*", "*.a", "*.o", "*.obj", "*.so", "*.Z", "*.elc", "*.ln",
-  "core", NULL};
-
+static char default_cvsignore[] = 
+	/* These default ignored items come from the CVS manual. */
+	"RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS"
+	" .make.state .nse_depinfo *~ #* .#* ,* _$* *$"
+	" *.old *.bak *.BAK *.orig *.rej .del-*"
+	" *.a *.olb *.o *.obj *.so *.exe"
+	" *.Z *.elc *.ln core"
+	/* The rest we added to suit ourself. */
+	" .svn/";
 
 void add_cvs_excludes(void)
 {
 	char fname[MAXPATHLEN];
 	char *p;
-	int i;
 
-	for (i=0; cvs_ignore_list[i]; i++)
-		add_exclude(&exclude_list, cvs_ignore_list[i], ADD_EXCLUDE);
+	add_exclude(&exclude_list, default_cvsignore,
+		    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
 
 	if ((p = getenv("HOME"))
-	    && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname)
-		add_exclude_file(&exclude_list, fname, MISSING_OK, ADD_EXCLUDE);
+	    && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname) {
+		add_exclude_file(&exclude_list, fname,
+				 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
+	}
 
-	add_exclude_line(&exclude_list, getenv("CVSIGNORE"), ADD_EXCLUDE);
+	add_exclude(&exclude_list, getenv("CVSIGNORE"),
+		    XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
 }