X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/37f9805dabba76b7a00bd2a0227762f6f239b598..9fdb334e8518d80914aa33282d718d9ee6809b30:/exclude.c

diff --git a/exclude.c b/exclude.c
index 9b325542..81aaed9d 100644
--- a/exclude.c
+++ b/exclude.c
@@ -1,329 +1,447 @@
-/* 
-   Copyright (C) Andrew Tridgell 1996
-   Copyright (C) Paul Mackerras 1996
-   
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-   
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
+/* -*- c-file-style: "linux" -*-
+ *
+ * Copyright (C) 1996-2001 by Andrew Tridgell <tridge@samba.org>
+ * Copyright (C) 1996 by Paul Mackerras
+ * Copyright (C) 2002 by Martin Pool
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
 
 /* a lot of this stuff was originally derived from GNU tar, although
    it has now changed so much that it is hard to tell :) */
 
+/* include/exclude cluestick added by Martin Pool <mbp@samba.org> */
+
 #include "rsync.h"
 
 extern int verbose;
+extern int eol_nulls;
+extern int list_only;
+extern int recurse;
 
-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) ");
-	}
+extern char curr_dir[];
 
-	/* 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;
-}
+struct exclude_list_struct exclude_list = { 0, 0, "" };
+struct exclude_list_struct local_exclude_list = { 0, 0, "local-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(char *pattern, int include)
+/** Build an exclude structure given a exclude pattern */
+static void make_exclude(struct exclude_list_struct *listp, const char *pattern,
+			 int pat_len, int include)
 {
 	struct exclude_struct *ret;
-
-	ret = (struct exclude_struct *)malloc(sizeof(*ret));
-	if (!ret) out_of_memory("make_exclude");
-
-	memset(ret, 0, sizeof(*ret));
-
-	if (strncmp(pattern,"- ",2) == 0) {
-		pattern += 2;
-	} else if (strncmp(pattern,"+ ",2) == 0) {
-		ret->include = 1;
-		pattern += 2;
-	} else {
-		ret->include = include;
-	}
-
-	ret->pattern = strdup(pattern);
-
-	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;
+	const char *cp;
+	int ex_len;
+
+	ret = new(struct exclude_struct);
+	if (!ret)
+		out_of_memory("make_exclude");
+
+	memset(ret, 0, sizeof ret[0]);
+	ret->include = include;
+
+	if (exclude_path_prefix)
+		ret->match_flags |= MATCHFLG_ABS_PATH;
+	if (exclude_path_prefix && *pattern == '/')
+		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, pattern, pat_len + 1);
+	pat_len += ex_len;
+
+	if (strpbrk(ret->pattern, "*[?")) {
+		ret->match_flags |= MATCHFLG_WILD;
+		if ((cp = strstr(ret->pattern, "**")) != NULL) {
+			ret->match_flags |= MATCHFLG_WILD2;
+			/* If the pattern starts with **, note that. */
+			if (cp == ret->pattern)
+				ret->match_flags |= MATCHFLG_WILD2_PREFIX;
+		}
 	}
 
-	if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') {
-		ret->pattern[strlen(pattern)-1] = 0;
+	if (pat_len > 1 && ret->pattern[pat_len-1] == '/') {
+		ret->pattern[pat_len-1] = 0;
 		ret->directory = 1;
 	}
 
-	if (!strchr(ret->pattern,'/')) {
-		ret->local = 1;
-	}
+	for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
+		ret->slash_cnt++;
 
-	return ret;
+	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));
 	free(ex);
 }
 
-static int check_one_exclude(char *name,struct exclude_struct *ex,
-			     STRUCT_STAT *st)
+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);
+	}
+
+	listp->head = listp->tail = NULL;
+}
+
+static int check_one_exclude(char *name, struct exclude_struct *ex,
+                             int name_is_dir)
 {
 	char *p;
-	int match_start=0;
+	int match_start = 0;
 	char *pattern = ex->pattern;
 
-	if (ex->local && (p=strrchr(name,'/')))
-		name = p+1;
+	/* 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. */
+	if (!ex->slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) {
+		if ((p = strrchr(name,'/')) != NULL)
+			name = p+1;
+	}
+	else if ((ex->match_flags & MATCHFLG_ABS_PATH) && *name != '/') {
+		static char full_name[MAXPATHLEN];
+		int plus = curr_dir[1] == '\0'? 1 : 0;
+		pathjoin(full_name, sizeof full_name, curr_dir+plus, name);
+		name = full_name;
+	}
 
 	if (!name[0]) return 0;
 
-	if (ex->directory && !S_ISDIR(st->st_mode)) return 0;
+	if (ex->directory && !name_is_dir) return 0;
 
-	if (*pattern == '/' && *name != '/') {
+	if (*pattern == '/') {
 		match_start = 1;
 		pattern++;
+		if (*name == '/')
+			name++;
 	}
 
-	if (ex->regular_exp) {
-		if (fnmatch(pattern, name, 0) == 0)
+	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)) {
+			int cnt = ex->slash_cnt + 1;
+			for (p = name + strlen(name) - 1; p >= name; p--) {
+				if (*p == '/' && !--cnt)
+					break;
+			}
+			name = p+1;
+		}
+		if (wildmatch(pattern, name))
+			return 1;
+		if (ex->match_flags & MATCHFLG_WILD2_PREFIX) {
+			/* If the **-prefixed pattern has a '/' as the next
+			 * character, then try to match the rest of the
+			 * pattern at the root. */
+			if (pattern[2] == '/' && wildmatch(pattern+3, name))
+				return 1;
+		}
+		else if (!match_start && ex->match_flags & MATCHFLG_WILD2) {
+			/* A non-anchored match with an infix or trailing "**"
+			 * (but not a prefixed "**") needs to try matching
+			 * after every slash. */
+			while ((name = strchr(name, '/')) != NULL) {
+				name++;
+				if (wildmatch(pattern, name))
+					return 1;
+			}
+		}
+	} else if (match_start) {
+		if (strcmp(name,pattern) == 0)
 			return 1;
 	} else {
 		int l1 = strlen(name);
 		int l2 = strlen(pattern);
-		if (l2 <= l1 && 
+		if (l2 <= l1 &&
 		    strcmp(name+(l1-l2),pattern) == 0 &&
-		    (l1==l2 || (!match_start && name[l1-(l2+1)] == '/')))
+		    (l1==l2 || name[l1-(l2+1)] == '/')) {
 			return 1;
+		}
 	}
 
 	return 0;
 }
 
 
-int check_exclude(char *name,struct exclude_struct **local_exclude_list,
-		  STRUCT_STAT *st)
+static void report_exclude_result(char const *name,
+                                  struct exclude_struct const *ent,
+                                  int name_is_dir, const char *type)
 {
-	int n;
-
-	if (exclude_list) {
-		for (n=0; exclude_list[n]; n++)
-			if (check_one_exclude(name,exclude_list[n],st))
-				return !exclude_list[n]->include;
+	/* 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] %scluding %s %s because of %spattern %s%s\n",
+			who_am_i(), ent->include ? "in" : "ex",
+			name_is_dir ? "directory" : "file", name, type,
+			ent->pattern, ent->directory ? "/" : "");
 	}
-
-	if (local_exclude_list) {
-		for (n=0; local_exclude_list[n]; n++)
-			if (check_one_exclude(name,local_exclude_list[n],st))
-				return !local_exclude_list[n]->include;
-	}
-
-	return 0;
 }
 
 
-void add_exclude_list(char *pattern,struct exclude_struct ***list, int include)
+/*
+ * Return true if file NAME is defined to be excluded by the specified
+ * exclude list.  Returns -1 for an exclude, 1 for an include, and 0 if
+ * no match.
+ */
+int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir)
 {
-	int len=0;
-	if (list && *list)
-		for (; (*list)[len]; len++) ;
-
-	if (strcmp(pattern,"!") == 0) {
-		if (verbose > 2)
-			rprintf(FINFO,"clearing exclude list\n");
-		while ((len)--) {
-			free_exclude((*list)[len]);
+	struct exclude_struct *ent;
+
+	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,
+					      listp->debug_type);
+			return ent->include ? 1 : -1;
 		}
-		free((*list));
-		*list = NULL;
-		only_included_files = 1;
-		exclude_the_rest = NULL;
-		return;
 	}
 
-	*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");
-	
-	if (verbose > 2)
-		rprintf(FINFO,"add_exclude(%s)\n",pattern);
-	
-	(*list)[len+1] = NULL;
+	return 0;
 }
 
-void add_exclude(char *pattern, int include)
-{
-	add_exclude_list(pattern,&exclude_list, include);
-}
 
-struct exclude_struct **make_exclude_list(char *fname,
-					  struct exclude_struct **list1,
-					  int fatal, 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 will not split off a
+ * prefix of "+ " or "- " unless xflags contains XFLG_NO_PREFIXES.  The
+ * *incl_ptr value will be 1 for an include, 0 for an exclude, and -1 for
+ * the list-clearing "!" token.
+ */
+static const char *get_exclude_tok(const char *p, int *len_ptr, int *incl_ptr,
+				   int xflags)
 {
-	struct exclude_struct **list=list1;
-	FILE *f = fopen(fname,"r");
-	char line[MAXPATHLEN];
-	if (!f) {
-		if (fatal) {
-			rprintf(FERROR,"%s : %s\n",fname,strerror(errno));
-			exit_cleanup(RERR_FILEIO);
-		}
-		return list;
+	const unsigned char *s = (const unsigned char *)p;
+	int len;
+
+	if (xflags & XFLG_WORD_SPLIT) {
+		/* Skip over any initial whitespace. */
+		while (isspace(*s))
+			s++;
+		/* Update for "!" check. */
+		p = (const char *)s;
 	}
 
-	while (fgets(line,MAXPATHLEN,f)) {
-		int l = strlen(line);
-		if (l && line[l-1] == '\n') l--;
-		line[l] = 0;
-		if (line[0]) add_exclude_list(line,&list,include);
-	}
-	fclose(f);
-	return list;
+	/* Is this a '+' or '-' followed by a space (not whitespace)? */
+	if (!(xflags & XFLG_NO_PREFIXES)
+	    && (*s == '-' || *s == '+') && s[1] == ' ') {
+		*incl_ptr = *s == '+';
+		s += 2;
+	} else
+		*incl_ptr = xflags & XFLG_DEF_INCLUDE;
+
+	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 && !(xflags & XFLG_NO_PREFIXES))
+		*incl_ptr = -1;
+
+	*len_ptr = len;
+	return (const char *)s;
 }
 
 
-void add_exclude_file(char *fname,int fatal,int include)
+void add_exclude(struct exclude_list_struct *listp, const char *pattern,
+		 int xflags)
 {
-	if (!fname || !*fname) return;
+	int pat_len, incl;
+	const char *cp;
 
-	exclude_list = make_exclude_list(fname,exclude_list,fatal,include);
+	if (!pattern)
+		return;
+
+	cp = pattern;
+	pat_len = 0;
+	while (1) {
+		cp = get_exclude_tok(cp + pat_len, &pat_len, &incl, xflags);
+		if (!pat_len)
+			break;
+		/* If we got the special "!" token, clear the list. */
+		if (incl < 0)
+			free_exclude_list(listp);
+		else {
+			make_exclude(listp, cp, pat_len, incl);
+
+			if (verbose > 2) {
+				rprintf(FINFO, "[%s] add_exclude(%.*s, %s%s)\n",
+					who_am_i(), pat_len, cp,
+					listp->debug_type,
+					incl ? "include" : "exclude");
+			}
+		}
+	}
 }
 
 
-void send_exclude_list(int f)
+void add_exclude_file(struct exclude_list_struct *listp, const char *fname,
+		      int xflags)
 {
-	int i;
-	extern int remote_version;
+	FILE *fp;
+	char line[MAXPATHLEN];
+	char *eob = line + MAXPATHLEN - 1;
+	int word_split = xflags & XFLG_WORD_SPLIT;
 
-	if (!exclude_list) {
-		write_int(f,0);
+	if (!fname || !*fname)
 		return;
-	}
 
-	for (i=0;exclude_list[i];i++) {
-		char *pattern = exclude_list[i]->pattern; 
-		int l;
+	if (*fname != '-' || fname[1])
+		fp = fopen(fname, "rb");
+	else
+		fp = stdin;
+	if (!fp) {
+		if (xflags & XFLG_FATAL_ERRORS) {
+			rsyserr(FERROR, errno,
+				"failed to open %s file %s",
+				xflags & XFLG_DEF_INCLUDE ? "include" : "exclude",
+				fname);
+			exit_cleanup(RERR_FILEIO);
+		}
+		return;
+	}
 
-		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(RERR_UNSUPPORTED);
+	while (1) {
+		char *s = line;
+		int ch;
+		while (1) {
+			if ((ch = getc(fp)) == EOF) {
+				if (ferror(fp) && errno == EINTR)
+					continue;
+				break;
 			}
-			write_int(f,l+2);
-			write_buf(f,"+ ",2);
-		} else {
-			write_int(f,l);
+			if (word_split && isspace(ch))
+				break;
+			if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
+				break;
+			if (s < eob)
+				*s++ = ch;
 		}
-		write_buf(f,pattern,l);
-	}    
-
-	write_int(f,0);
+		*s = '\0';
+		/* Skip lines starting with semicolon or pound. */
+		if (*line && *line != ';' && *line != '#')
+			add_exclude(listp, line, xflags);
+		if (ch == EOF)
+			break;
+	}
+	fclose(fp);
 }
 
 
-void recv_exclude_list(int f)
+void send_exclude_list(int f)
 {
-	char line[MAXPATHLEN];
-	int l;
-	while ((l=read_int(f))) {
-		if (l >= MAXPATHLEN) overflow("recv_exclude_list");
-		read_sbuf(f,line,l);
-		add_exclude(line,0);
+	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, "/*/*", 0);
+
+	for (ent = exclude_list.head; ent; ent = ent->next) {
+		unsigned int l;
+		char p[MAXPATHLEN+1];
+
+		l = strlcpy(p, ent->pattern, sizeof p);
+		if (l == 0 || l >= MAXPATHLEN)
+			continue;
+		if (ent->directory) {
+			p[l++] = '/';
+			p[l] = '\0';
+		}
+
+		if (ent->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);
 }
 
 
-void add_exclude_line(char *p)
+void recv_exclude_list(int f)
 {
-	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," "))
-		add_exclude(tok, 0);
-	free(p);
+	char line[MAXPATHLEN+1]; /* Allows a trailing slash on a max-len dir */
+	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, 0);
+	}
 }
 
 
-static char *cvs_ignore_list[] = {
-  "RCS","SCCS","CVS","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(cvs_ignore_list[i], 0);
-
-	if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) {
-		slprintf(fname,sizeof(fname), "%s/.cvsignore",p);
-		add_exclude_file(fname,0,0);
+
+	add_exclude(&exclude_list, default_cvsignore,
+		    XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
+
+	if ((p = getenv("HOME"))
+	    && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname) {
+		add_exclude_file(&exclude_list, fname,
+				 XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
 	}
 
-	add_exclude_line(getenv("CVSIGNORE"));
+	add_exclude(&exclude_list, getenv("CVSIGNORE"),
+		    XFLG_WORD_SPLIT | XFLG_NO_PREFIXES);
 }