X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/55c412630cb5f3b1cece481400846bec77733c01..f167879035940c9bc30b687699fdd309e549b5f5:/exclude.c

diff --git a/exclude.c b/exclude.c
index bc180f20..71bc3bda 100644
--- a/exclude.c
+++ b/exclude.c
@@ -500,6 +500,8 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
 	char *p, *pattern = ex->pattern;
 	const char *strings[16]; /* more than enough */
 
+	if (*name == '/')
+		name++;
 	if (!*name)
 		return 0;
 
@@ -531,8 +533,6 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
 	if (*pattern == '/') {
 		anchored_match = 1;
 		pattern++;
-		if (strings[0][0] == '/')
-			strings[0]++;
 	}
 
 	if (!anchored_match && ex->u.slash_cnt
@@ -847,6 +847,14 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
 		exit_cleanup(RERR_SYNTAX);
 	}
 
+	/* --delete-excluded turns an un-modified include/exclude into a
+	 * sender-side rule.  We also affect a per-dir .cvsignore file so
+	 * that we are compatible with older protocol versions. */
+	if (delete_excluded
+	 && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE))
+	 && (!(new_mflags & MATCHFLG_PERDIR_MERGE) || new_mflags & MATCHFLG_CVS_IGNORE))
+		new_mflags |= MATCHFLG_SENDER_SIDE;
+
 	*len_ptr = len;
 	*mflags_ptr = new_mflags;
 	return (const char *)s;
@@ -1098,11 +1106,15 @@ static void send_rules(int f_out, struct filter_list_struct *flp)
 		int elide = 0;
 		char *p;
 
+		/* Note we need to check delete_excluded here in addition to
+		 * the code in parse_rule_tok() because some rules may have
+		 * been added before we found the --delete-excluded option. */
 		if (ent->match_flags & MATCHFLG_SENDER_SIDE)
 			elide = am_sender ? 1 : -1;
 		if (ent->match_flags & MATCHFLG_RECEIVER_SIDE)
 			elide = elide ? 0 : am_sender ? -1 : 1;
-		else if (delete_excluded && !elide)
+		else if (delete_excluded && !elide
+		 && (!(ent->match_flags & MATCHFLG_PERDIR_MERGE) || ent->match_flags & MATCHFLG_CVS_IGNORE))
 			elide = am_sender ? 1 : -1;
 		if (elide < 0) {
 			if (prev)