X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/2765f2e4a7293a72869d97bad96ef4ed032ee5c5..bec617b934dc2ef90b7acd1c7ef4b5db74821e91:/exclude.c

diff --git a/exclude.c b/exclude.c
index f2be6a9b..59b4ef52 100644
--- a/exclude.c
+++ b/exclude.c
@@ -1105,9 +1105,9 @@ static void send_rules(int f_out, struct filter_list_struct *flp)
 			continue;
 		if (ent->match_flags & MATCHFLG_CVS_IGNORE
 		    && !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
-			int f = am_sender || protocol_version < 29 ? f_out : -1;
+			int f = am_sender || protocol_version < 29 ? f_out : -2;
 			send_rules(f, &cvs_filter_list);
-			if (f >= 0 || f_out < 0)
+			if (f == f_out)
 				continue;
 		}
 		p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);
@@ -1176,7 +1176,7 @@ void recv_filter_list(int f_in)
 	if (!local_server && (am_sender || receiver_wants_list)) {
 		while ((len = read_int(f_in)) != 0) {
 			if (len >= sizeof line)
-				overflow("recv_rules");
+				overflow_exit("recv_rules");
 			read_sbuf(f_in, line, len);
 			parse_rule(&filter_list, line, 0, xflags);
 		}