summaryrefslogtreecommitdiff
path: root/exclude.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-02-26 02:56:30 +0000
committerWayne Davison <wayned@samba.org>2005-02-26 02:56:30 +0000
commit2217b30adfaff4e8579177bc5f8c0de268d3bf57 (patch)
treec3700c5bde21a0f4c0b04085421b87dbf9b3e704 /exclude.c
parent9ac2395bf074c0347db02bcce72e901da5eb689b (diff)
downloadrsync-2217b30adfaff4e8579177bc5f8c0de268d3bf57.tar.gz
Fixed a problem sending include rules to an older rsync.
Diffstat (limited to 'exclude.c')
-rw-r--r--exclude.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/exclude.c b/exclude.c
index fa11e449..87013ec4 100644
--- a/exclude.c
+++ b/exclude.c
@@ -1034,7 +1034,7 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
{
static char buf[MAX_RULE_PREFIX+1];
char *op = buf;
- int legal_len = for_xfer && protocol_version < 29 ? 1 : MAX_RULE_PREFIX;
+ int legal_len = for_xfer && protocol_version < 29 ? 1 : MAX_RULE_PREFIX-1;
if (match_flags & MATCHFLG_PERDIR_MERGE) {
if (legal_len == 1)
@@ -1071,10 +1071,10 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer,
&& (!for_xfer || protocol_version >= 29
|| (delete_excluded && am_sender)))
*op++ = 'r';
- if (legal_len)
- *op++ = ' ';
if (op - buf > legal_len)
return NULL;
+ if (legal_len)
+ *op++ = ' ';
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;