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
Allow deletions to occur in directories transferred with the
[rsync/rsync.git]
/
exclude.c
diff --git
a/exclude.c
b/exclude.c
index
f2be6a9
..
a83584a
100644
(file)
--- a/
exclude.c
+++ b/
exclude.c
@@
-827,7
+827,8
@@
static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags,
len = strlen((char*)s);
if (new_mflags & MATCHFLG_CLEAR_LIST) {
len = strlen((char*)s);
if (new_mflags & MATCHFLG_CLEAR_LIST) {
- if (!(xflags & XFLG_OLD_PREFIXES) && len) {
+ if (!(mflags & MATCHFLG_NO_PREFIXES)
+ && !(xflags & XFLG_OLD_PREFIXES) && len) {
rprintf(FERROR,
"'!' rule has trailing characters: %s\n", p);
exit_cleanup(RERR_SYNTAX);
rprintf(FERROR,
"'!' rule has trailing characters: %s\n", p);
exit_cleanup(RERR_SYNTAX);
@@
-954,7
+955,7
@@
void parse_filter_file(struct filter_list_struct *listp, const char *fname,
uint32 mflags, int xflags)
{
FILE *fp;
uint32 mflags, int xflags)
{
FILE *fp;
- char line[
MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
+ char line[
BIGPATHBUFLEN];
char *eob = line + sizeof line - 1;
int word_split = mflags & MATCHFLG_WORD_SPLIT;
char *eob = line + sizeof line - 1;
int word_split = mflags & MATCHFLG_WORD_SPLIT;
@@
-1105,9
+1106,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)) {
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);
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);
continue;
}
p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);
@@
-1167,7
+1168,7
@@
void send_filter_list(int f_out)
/* This is only called by the server. */
void recv_filter_list(int f_in)
{
/* This is only called by the server. */
void recv_filter_list(int f_in)
{
- char line[
MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
+ char line[
BIGPATHBUFLEN];
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
int receiver_wants_list = delete_mode
&& (!delete_excluded || protocol_version >= 29);
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
int receiver_wants_list = delete_mode
&& (!delete_excluded || protocol_version >= 29);
@@
-1176,7
+1177,7
@@
void recv_filter_list(int f_in)
if (!local_server && (am_sender || receiver_wants_list)) {
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
if (!local_server && (am_sender || receiver_wants_list)) {
while ((len = read_int(f_in)) != 0) {
if (len >= sizeof line)
- overflow("recv_rules");
+ overflow
_exit
("recv_rules");
read_sbuf(f_in, line, len);
parse_rule(&filter_list, line, 0, xflags);
}
read_sbuf(f_in, line, len);
parse_rule(&filter_list, line, 0, xflags);
}