X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fdc795015ff2a8adb330a1ee2180f9944b21a997..1412da7c3272dad46c5f9434c3b8645e16189f80:/exclude.c

diff --git a/exclude.c b/exclude.c
index 9fdae3e3..a6d5b5c3 100644
--- a/exclude.c
+++ b/exclude.c
@@ -33,6 +33,7 @@ extern int eol_nulls;
 extern int list_only;
 extern int recurse;
 extern int io_error;
+extern int local_server;
 extern int delete_mode;
 extern int delete_excluded;
 extern int cvs_exclude;
@@ -932,10 +933,10 @@ char *get_rule_prefix(int match_flags, const char *pat, int sending,
 	if (match_flags & MATCHFLG_CVS_IGNORE)
 		*op++ = 'C';
 	else {
-		if (match_flags & MATCHFLG_WORD_SPLIT)
-			*op++ = 's';
 		if (match_flags & MATCHFLG_NO_INHERIT)
 			*op++ = 'n';
+		if (match_flags & MATCHFLG_WORD_SPLIT)
+			*op++ = 'w';
 		if (match_flags & MATCHFLG_NO_PREFIXES) {
 			if (match_flags & MATCHFLG_INCLUDE)
 				*op++ = '+';
@@ -992,7 +993,7 @@ static void send_rules(int f_out, struct filter_list_struct *flp)
 /* This is only called by the client. */
 void send_filter_list(int f_out)
 {
-	if (am_sender && (!delete_mode || delete_excluded))
+	if (local_server || (am_sender && (!delete_mode || delete_excluded)))
 		f_out = -1;
 	if (cvs_exclude && am_sender) {
 		if (protocol_version >= 29)
@@ -1025,7 +1026,7 @@ void recv_filter_list(int f_in)
 	int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
 	unsigned int len;
 
-	if (am_sender || (delete_mode && !delete_excluded)) {
+	if (!local_server && (am_sender || (delete_mode && !delete_excluded))) {
 		while ((len = read_int(f_in)) != 0) {
 			if (len >= sizeof line)
 				overflow("recv_rules");
@@ -1035,9 +1036,9 @@ void recv_filter_list(int f_in)
 	}
 
 	if (cvs_exclude) {
-		if (am_sender || protocol_version < 29)
+		if (local_server || am_sender || protocol_version < 29)
 			parse_rule(&filter_list, ":C", 0, 0);
-		if (am_sender)
+		if (local_server || am_sender)
 			parse_rule(&filter_list, "-C", 0, 0);
 	}
 }