Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document the new --only-write-batch=FILE option.
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
fa11e44
..
5536d8a
100644
(file)
--- 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;
} 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 = "";
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:
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 != '_') {
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;
{
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)
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';
&& (!for_xfer || protocol_version >= 29
|| (delete_excluded && am_sender)))
*op++ = 'r';
- if (legal_len)
- *op++ = ' ';
if (op - buf > legal_len)
return NULL;
if (op - buf > legal_len)
return NULL;
+ if (legal_len)
+ *op++ = ' ';
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;