X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4adbb5f24683417a90a1cc00be54e58d2f7a901a..c70e07d9ac09da1f00c531bb9137347f516f88f9:/exclude.c diff --git a/exclude.c b/exclude.c index fa11e449..a606b1bc 100644 --- a/exclude.c +++ b/exclude.c @@ -757,7 +757,7 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, mods = NULL; break; default: - rprintf(FERROR, "Unknown filter rule: %s\n", p); + rprintf(FERROR, "Unknown filter rule: `%s'\n", p); exit_cleanup(RERR_SYNTAX); } while (mods && *++s && *s != ' ' && *s != '_') { @@ -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;