X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4adbb5f24683417a90a1cc00be54e58d2f7a901a..2e8015e0daf09a2df2c94031a80ecdd12376e0c2:/exclude.c

diff --git a/exclude.c b/exclude.c
index fa11e449..5536d8a9 100644
--- a/exclude.c
+++ b/exclude.c
@@ -674,8 +674,7 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
 		} else if (*s == '+' && s[1] == ' ') {
 			new_mflags |= MATCHFLG_INCLUDE;
 			s += 2;
-		}
-		if (*s == '!')
+		} else if (*s == '!')
 			new_mflags |= MATCHFLG_CLEAR_LIST; /* Tentative! */
 	} else {
 		char ch = 0, *mods = "";
@@ -757,7 +756,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 +1033,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 +1070,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;