aboutsummaryrefslogtreecommitdiffstats
path: root/exclude.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-04-26 15:24:40 +0000
committerWayne Davison <wayned@samba.org>2005-04-26 15:24:40 +0000
commit2765f2e4a7293a72869d97bad96ef4ed032ee5c5 (patch)
treeec3bbcf4e61d701c48df1b8a78568d85332c8131 /exclude.c
parent79db59d1a72c584f4ac4629539b4f67c180d79dd (diff)
downloadandroid_external_rsync-2765f2e4a7293a72869d97bad96ef4ed032ee5c5.tar.gz
android_external_rsync-2765f2e4a7293a72869d97bad96ef4ed032ee5c5.tar.bz2
android_external_rsync-2765f2e4a7293a72869d97bad96ef4ed032ee5c5.zip
Fixed problem with -C when we're the sender, the remote is using an
older protocol, and we're not sending the exclude list (i.e. the user didn't specify --delete or they specified --delete-ignored).
Diffstat (limited to 'exclude.c')
-rw-r--r--exclude.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/exclude.c b/exclude.c
index 5536d8a9..f2be6a9b 100644
--- a/exclude.c
+++ b/exclude.c
@@ -715,7 +715,6 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
if ((s = RULE_STRCMP(s, "show")) != NULL)
ch = 'S';
break;
-
default:
ch = *s;
if (s[1] == ',')
@@ -1108,7 +1107,7 @@ static void send_rules(int f_out, struct filter_list_struct *flp)
&& !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
int f = am_sender || protocol_version < 29 ? f_out : -1;
send_rules(f, &cvs_filter_list);
- if (f >= 0)
+ if (f >= 0 || f_out < 0)
continue;
}
p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);