aboutsummaryrefslogtreecommitdiffstats
path: root/exclude.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-04-26 16:09:03 +0000
committerWayne Davison <wayned@samba.org>2005-04-26 16:09:03 +0000
commit98e4741463ea13c017e1d0776dbf3939da11d75a (patch)
tree28e9a8d63bbd740c294611da3a951be47d5b5a84 /exclude.c
parent028245a57b37d759532f53c3c08109b423cdef1a (diff)
downloadandroid_external_rsync-98e4741463ea13c017e1d0776dbf3939da11d75a.tar.gz
android_external_rsync-98e4741463ea13c017e1d0776dbf3939da11d75a.tar.bz2
android_external_rsync-98e4741463ea13c017e1d0776dbf3939da11d75a.zip
A slightly better fix than the last one (though it won't make any
difference in how the code behaves due to how it is called).
Diffstat (limited to 'exclude.c')
-rw-r--r--exclude.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/exclude.c b/exclude.c
index f2be6a9b..36faa966 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);