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

diff --git a/exclude.c b/exclude.c
index df69ad3a..1a0be70f 100644
--- a/exclude.c
+++ b/exclude.c
@@ -4,11 +4,11 @@
  * Copyright (C) 1996-2001 Andrew Tridgell <tridge@samba.org>
  * Copyright (C) 1996 Paul Mackerras
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
+ * Copyright (C) 2003-2007 Wayne Davison
  *
  * 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
+ * the Free Software Foundation; either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
@@ -17,8 +17,7 @@
  * 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.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -32,6 +31,7 @@ extern int recurse;
 extern int io_error;
 extern int local_server;
 extern int prune_empty_dirs;
+extern int ignore_perishable;
 extern int delete_mode;
 extern int delete_excluded;
 extern int cvs_exclude;
@@ -51,8 +51,8 @@ struct filter_list_struct server_filter_list = { 0, 0, " [daemon]" };
 #define MAX_RULE_PREFIX (16)
 
 #define MODIFIERS_MERGE_FILE "-+Cenw"
-#define MODIFIERS_INCL_EXCL "/!Crs"
-#define MODIFIERS_HIDE_PROTECT "/!"
+#define MODIFIERS_INCL_EXCL "/!Crsp"
+#define MODIFIERS_HIDE_PROTECT "/!p"
 
 /* The dirbuf is set by push_local_filters() to the current subdirectory
  * relative to curr_dir that is being processed.  The path always has a
@@ -492,6 +492,30 @@ void pop_local_filters(void *mem)
 	free(pop);
 }
 
+void change_local_filter_dir(const char *dname, int dlen, int dir_depth)
+{
+	static int min_depth = MAXPATHLEN, cur_depth = -1;
+	static void *filt_array[MAXPATHLEN/2+1];
+
+	if (!dname) {
+		while (cur_depth >= min_depth)
+			pop_local_filters(filt_array[cur_depth--]);
+		min_depth = MAXPATHLEN;
+		cur_depth = -1;
+		return;
+	}
+
+	assert(dir_depth < MAXPATHLEN/2+1);
+
+	while (cur_depth >= dir_depth && cur_depth >= min_depth)
+		pop_local_filters(filt_array[cur_depth--]);
+	cur_depth = dir_depth;
+	if (cur_depth < min_depth)
+		min_depth = cur_depth;
+
+	filt_array[cur_depth] = push_local_filters(dname, dlen);
+}
+
 static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
 {
 	int slash_handling, str_cnt = 0, anchored_match = 0;
@@ -601,6 +625,8 @@ int check_filter(struct filter_list_struct *listp, char *name, int name_is_dir)
 	struct filter_struct *ent;
 
 	for (ent = listp->head; ent; ent = ent->next) {
+		if (ignore_perishable && ent->match_flags & MATCHFLG_PERISHABLE)
+			continue;
 		if (ent->match_flags & MATCHFLG_PERDIR_MERGE) {
 			int rc = check_filter(ent->u.mergelist, name,
 					      name_is_dir);
@@ -808,6 +834,9 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
 			case 'n':
 				new_mflags |= MATCHFLG_NO_INHERIT;
 				break;
+			case 'p':
+				new_mflags |= MATCHFLG_PERISHABLE;
+				break;
 			case 'r':
 				new_mflags |= MATCHFLG_RECEIVER_SIDE;
 				break;
@@ -873,14 +902,16 @@ static char default_cvsignore[] =
 
 static void get_cvs_excludes(uint32 mflags)
 {
-	char *p, fname[MAXPATHLEN];
 	static int initialized = 0;
+	char *p, fname[MAXPATHLEN];
 
 	if (initialized)
 		return;
 	initialized = 1;
 
-	parse_rule(&cvs_filter_list, default_cvsignore, mflags, 0);
+	parse_rule(&cvs_filter_list, default_cvsignore,
+		   mflags | (protocol_version >= 30 ? MATCHFLG_PERISHABLE : 0),
+		   0);
 
 	p = module_id >= 0 && lp_use_chroot(module_id) ? "/" : getenv("HOME");
 	if (p && pathjoin(fname, MAXPATHLEN, p, ".cvsignore") < MAXPATHLEN)
@@ -1064,6 +1095,8 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
 	else
 		legal_len = 0;
 
+	if (match_flags & MATCHFLG_NEGATE)
+		*op++ = '!';
 	if (match_flags & MATCHFLG_CVS_IGNORE)
 		*op++ = 'C';
 	else {
@@ -1087,6 +1120,12 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
 	    && (!for_xfer || protocol_version >= 29
 	     || (delete_excluded && am_sender)))
 		*op++ = 'r';
+	if (match_flags & MATCHFLG_PERISHABLE) {
+		if (!for_xfer || protocol_version >= 30)
+			*op++ = 'p';
+		else if (am_sender)
+			return NULL;
+	}
 	if (op - buf > legal_len)
 		return NULL;
 	if (legal_len)