#define MAX_RULE_PREFIX (16)
#define MODIFIERS_MERGE_FILE "-+Cenw"
-#define MODIFIERS_INCL_EXCL "/!C"
+#define MODIFIERS_INCL_EXCL "/!Crs"
+#define MODIFIERS_HIDE_PROTECT "/!"
/* The dirbuf is set by push_local_filters() to the current subdirectory
* relative to curr_dir that is being processed. The path always has a
listp->debug_type);
}
+ /* This flag also indicates that we're reading a list that
+ * needs to be filtered now, not post-filtered later. */
+ if (xflags & XFLG_ANCHORED2ABS) {
+ uint32 mf = mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE);
+ if (am_sender) {
+ if (mf == MATCHFLG_RECEIVER_SIDE)
+ return;
+ } else {
+ if (mf == MATCHFLG_SENDER_SIDE)
+ return;
+ }
+ }
+
if (!(ret = new(struct filter_struct)))
out_of_memory("add_rule");
memset(ret, 0, sizeof ret[0]);
return 0;
}
-#define RULE_MATCH(s,r) rule_match((s), (r), sizeof (r) - 1)
+#define RULE_STRCMP(s,r) rule_strcmp((s), (r), sizeof (r) - 1)
-static const char *rule_match(const char *str, const char *rule, int rule_len)
+static const uchar *rule_strcmp(const uchar *str, const char *rule, int rule_len)
{
- if (strncmp(str, rule, rule_len) != 0)
+ if (strncmp((char*)str, rule, rule_len) != 0)
return NULL;
if (isspace(str[rule_len]) || str[rule_len] == '_' || !str[rule_len])
return str + rule_len - 1;
} 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 = "";
switch (*s) {
case 'c':
- if ((s = RULE_MATCH(s, "clear")) != NULL)
+ if ((s = RULE_STRCMP(s, "clear")) != NULL)
ch = '!';
break;
case 'd':
- if ((s = RULE_MATCH(s, "dir-merge")) != NULL)
+ if ((s = RULE_STRCMP(s, "dir-merge")) != NULL)
ch = ':';
break;
case 'e':
- if ((s = RULE_MATCH(s, "exclude")) != NULL)
+ if ((s = RULE_STRCMP(s, "exclude")) != NULL)
ch = '-';
break;
+ case 'h':
+ if ((s = RULE_STRCMP(s, "hide")) != NULL)
+ ch = 'H';
+ break;
case 'i':
- if ((s = RULE_MATCH(s, "include")) != NULL)
+ if ((s = RULE_STRCMP(s, "include")) != NULL)
ch = '+';
break;
case 'm':
- if ((s = RULE_MATCH(s, "merge")) != NULL)
+ if ((s = RULE_STRCMP(s, "merge")) != NULL)
ch = '.';
break;
+ case 'p':
+ if ((s = RULE_STRCMP(s, "protect")) != NULL)
+ ch = 'P';
+ break;
+ case 'r':
+ if ((s = RULE_STRCMP(s, "risk")) != NULL)
+ ch = 'R';
+ break;
+ case 's':
+ if ((s = RULE_STRCMP(s, "show")) != NULL)
+ ch = 'S';
+ break;
default:
ch = *s;
if (s[1] == ',')
case '-':
mods = MODIFIERS_INCL_EXCL;
break;
+ case 'S':
+ new_mflags |= MATCHFLG_INCLUDE;
+ /* FALL THROUGH */
+ case 'H':
+ new_mflags |= MATCHFLG_SENDER_SIDE;
+ mods = MODIFIERS_HIDE_PROTECT;
+ break;
+ case 'R':
+ new_mflags |= MATCHFLG_INCLUDE;
+ /* FALL THROUGH */
+ case 'P':
+ new_mflags |= MATCHFLG_RECEIVER_SIDE;
+ mods = MODIFIERS_HIDE_PROTECT;
+ break;
case '!':
new_mflags |= MATCHFLG_CLEAR_LIST;
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 != '_') {
case 'n':
new_mflags |= MATCHFLG_NO_INHERIT;
break;
+ case 'r':
+ new_mflags |= MATCHFLG_RECEIVER_SIDE;
+ break;
+ case 's':
+ new_mflags |= MATCHFLG_SENDER_SIDE;
+ break;
case 'w':
new_mflags |= MATCHFLG_WORD_SPLIT;
break;
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);
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;
{
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_EXCLUDE_SELF)
*op++ = 'e';
- if (legal_len)
- *op++ = ' ';
+ if (match_flags & MATCHFLG_SENDER_SIDE
+ && (!for_xfer || protocol_version >= 29))
+ *op++ = 's';
+ if (match_flags & MATCHFLG_RECEIVER_SIDE
+ && (!for_xfer || protocol_version >= 29
+ || (delete_excluded && am_sender)))
+ *op++ = 'r';
if (op - buf > legal_len)
return NULL;
+ if (legal_len)
+ *op++ = ' ';
*op = '\0';
if (plen_ptr)
*plen_ptr = op - buf;
static void send_rules(int f_out, struct filter_list_struct *flp)
{
- struct filter_struct *ent;
+ struct filter_struct *ent, *prev = NULL;
for (ent = flp->head; ent; ent = ent->next) {
unsigned int len, plen, dlen;
+ int elide = 0;
char *p;
+ if (ent->match_flags & MATCHFLG_SENDER_SIDE)
+ elide = am_sender ? 1 : -1;
+ if (ent->match_flags & MATCHFLG_RECEIVER_SIDE)
+ elide = elide ? 0 : am_sender ? -1 : 1;
+ else if (delete_excluded && !elide)
+ elide = am_sender ? 1 : -1;
+ if (elide < 0) {
+ if (prev)
+ prev->next = ent->next;
+ else
+ flp->head = ent->next;
+ } else
+ prev = ent;
+ if (elide > 0)
+ continue;
if (ent->match_flags & MATCHFLG_CVS_IGNORE
&& !(ent->match_flags & MATCHFLG_MERGE_FILE)) {
- if (am_sender || protocol_version < 29) {
- send_rules(f_out, &cvs_filter_list);
+ int f = am_sender || protocol_version < 29 ? f_out : -2;
+ send_rules(f, &cvs_filter_list);
+ if (f == f_out)
continue;
- }
}
p = get_rule_prefix(ent->match_flags, ent->pattern, 1, &plen);
if (!p) {
"filter rules are too modern for remote rsync.\n");
exit_cleanup(RERR_SYNTAX);
}
+ if (f_out < 0)
+ continue;
len = strlen(ent->pattern);
dlen = ent->match_flags & MATCHFLG_DIRECTORY ? 1 : 0;
if (!(plen + len + dlen))
if (dlen)
write_byte(f_out, '/');
}
+ flp->tail = prev;
}
/* This is only called by the client. */
void send_filter_list(int f_out)
{
- int receiver_wants_list = delete_mode && !delete_excluded;
+ int receiver_wants_list = delete_mode
+ && (!delete_excluded || protocol_version >= 29);
if (local_server || (am_sender && !receiver_wants_list))
f_out = -1;
if (list_only == 1 && !recurse)
parse_rule(&filter_list, "/*/*", MATCHFLG_NO_PREFIXES, 0);
- if (f_out >= 0) {
- send_rules(f_out, &filter_list);
+ send_rules(f_out, &filter_list);
+
+ if (f_out >= 0)
write_int(f_out, 0);
- }
if (cvs_exclude) {
if (!am_sender || protocol_version < 29)
/* 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);
unsigned int len;
- int receiver_wants_list = delete_mode && !delete_excluded;
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);
}
if (local_server || am_sender)
parse_rule(&filter_list, "-C", 0, 0);
}
+
+ if (local_server) /* filter out any rules that aren't for us. */
+ send_rules(-1, &filter_list);
}
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff