#include "rsync.h"
extern int verbose;
+extern int am_server;
extern int eol_nulls;
extern int list_only;
extern int recurse;
extern int io_error;
extern int sanitize_paths;
extern int protocol_version;
+extern int module_id;
extern char curr_dir[];
extern unsigned int curr_dir_len;
/* Build a filter structure given a filter pattern. The value in "pat"
* is not null-terminated. */
-static void make_filter(struct filter_list_struct *listp, const char *pat,
- unsigned int pat_len, unsigned int mflags)
+static void filter_rule(struct filter_list_struct *listp, const char *pat,
+ unsigned int pat_len, unsigned int mflags, int xflags)
{
struct filter_struct *ret;
const char *cp;
unsigned int ex_len;
if (verbose > 2) {
- rprintf(FINFO, "[%s] make_filter(%.*s, %s%s)\n",
+ rprintf(FINFO, "[%s] filter_rule(%.*s, %s%s)\n",
who_am_i(), (int)pat_len, pat,
mflags & MATCHFLG_PERDIR_MERGE ? "per-dir-merge"
: mflags & MATCHFLG_INCLUDE ? "include" : "exclude",
ret = new(struct filter_struct);
if (!ret)
- out_of_memory("make_filter");
-
+ out_of_memory("filter_rule");
memset(ret, 0, sizeof ret[0]);
- if (mflags & MATCHFLG_ABS_PATH) {
- if (*pat != '/') {
- mflags &= ~MATCHFLG_ABS_PATH;
- ex_len = 0;
- } else
- ex_len = dirbuf_len - module_dirlen - 1;
+ if (xflags & XFLG_ANCHORED2ABS && *pat == '/'
+ && !(mflags & (MATCHFLG_ABS_PATH | MATCHFLG_MERGE_FILE))) {
+ mflags |= MATCHFLG_ABS_PATH;
+ ex_len = dirbuf_len - module_dirlen - 1;
} else
ex_len = 0;
ret->pattern = new_array(char, ex_len + pat_len + 1);
if (!ret->pattern)
- out_of_memory("make_filter");
+ out_of_memory("filter_rule");
if (ex_len)
memcpy(ret->pattern, dirbuf + module_dirlen, ex_len);
strlcpy(ret->pattern + ex_len, pat, pat_len + 1);
struct filter_struct *ex = mergelist_parents[i];
const char *s = strrchr(ex->pattern, '/');
if (s)
- s++;
+ s++;
else
- s = ex->pattern;
+ s = ex->pattern;
len = strlen(s);
if (len == pat_len - (cp - ret->pattern)
&& memcmp(s, cp, len) == 0) {
}
if (!(lp = new_array(struct filter_list_struct, 1)))
- out_of_memory("make_filter");
+ out_of_memory("filter_rule");
lp->head = lp->tail = NULL;
if (asprintf(&lp->debug_type, " (per-dir %s)", cp) < 0)
- out_of_memory("make_filter");
+ out_of_memory("filter_rule");
ret->u.mergelist = lp;
if (mergelist_cnt == mergelist_size) {
struct filter_struct *,
mergelist_size);
if (!mergelist_parents)
- out_of_memory("make_filter");
+ out_of_memory("filter_rule");
}
mergelist_parents[mergelist_cnt++] = ret;
} else {
*y = '\0';
dirbuf_len = y - dirbuf;
strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf));
- add_filter_file(lp, buf, flags | XFLG_ABS_PATH);
+ add_filter_file(lp, buf, flags | XFLG_ANCHORED2ABS);
if (ex->match_flags & MATCHFLG_NO_INHERIT)
lp->head = NULL;
lp->tail = NULL;
if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len)
- add_filter_file(lp, dirbuf, flags | XFLG_ABS_PATH);
+ add_filter_file(lp, dirbuf, flags | XFLG_ANCHORED2ABS);
else {
io_error |= IOERR_GENERAL;
rprintf(FINFO,
int name_is_dir, const char *type)
{
/* If a trailing slash is present to match only directories,
- * then it is stripped out by make_filter. So as a special
+ * then it is stripped out by filter_rule. So as a special
* case we add it back in here. */
if (verbose >= 2) {
break;
case '+':
mflags |= MATCHFLG_INCLUDE;
- break;
+ /* FALL THROUGH */
case '-':
+ mods = "/";
break;
case '!':
mflags |= MATCHFLG_CLEAR_LIST;
rprintf(FERROR, "Unknown filter rule: %s\n", p);
exit_cleanup(RERR_SYNTAX);
}
- while (mods && *++s && *s != ' ' && *s != '=' && *s != '_') {
+ while (mods && *++s && *s != ' ' && *s != '_') {
if (strchr(mods, *s) == NULL) {
if (xflags & XFLG_WORD_SPLIT && isspace(*s)) {
s--;
break;
}
rprintf(FERROR,
- "unknown option '%c' in filter rule: %s\n",
+ "unknown modifier '%c' in filter rule: %s\n",
*s, p);
exit_cleanup(RERR_SYNTAX);
}
mflags |= MATCHFLG_NO_PREFIXES
| MATCHFLG_INCLUDE;
break;
+ case '/':
+ mflags |= MATCHFLG_ABS_PATH;
+ break;
case 'C':
empty_pat_is_OK = 1;
mflags |= MATCHFLG_NO_PREFIXES
case 'n':
mflags |= MATCHFLG_NO_INHERIT;
break;
- case 's':
+ case 'w':
mflags |= MATCHFLG_WORD_SPLIT;
break;
}
cp++;
len = cp - s;
} else
- len = strlen(s);
+ len = strlen((char*)s);
if (mflags & MATCHFLG_CLEAR_LIST) {
if (!(xflags & (XFLG_DEF_INCLUDE | XFLG_DEF_EXCLUDE)) && len) {
exit_cleanup(RERR_SYNTAX);
}
- if (xflags & XFLG_ABS_PATH)
- mflags |= MATCHFLG_ABS_PATH;
-
*len_ptr = len;
*flag_ptr = mflags;
return (const char *)s;
len -= ++name - cp;
else
name = cp;
- make_filter(listp, name, len, 0);
+ filter_rule(listp, name, len, 0, 0);
mflags &= ~MATCHFLG_EXCLUDE_SELF;
len = pat_len;
}
if (parent_dirscan) {
if (!(p = parse_merge_name(cp, &len, module_dirlen)))
continue;
- make_filter(listp, p, len, mflags);
+ filter_rule(listp, p, len, mflags, 0);
continue;
}
} else {
}
}
- make_filter(listp, cp, pat_len, mflags);
+ filter_rule(listp, cp, pat_len, mflags, xflags);
}
}
if (!fname || !*fname)
return;
- if (*fname != '-' || fname[1])
- fp = fopen(fname, "rb");
- else
+ if (*fname != '-' || fname[1] || am_server) {
+ if (server_filter_list.head) {
+ strlcpy(line, fname, sizeof line);
+ clean_fname(line, 1);
+ if (check_filter(&server_filter_list, line, 0) < 0)
+ fp = NULL;
+ else
+ fp = fopen(line, "rb");
+ } else
+ fp = fopen(fname, "rb");
+ } else
fp = stdin;
+
+ if (verbose > 2) {
+ rprintf(FINFO, "[%s] add_filter_file(%s,%d)%s\n",
+ who_am_i(), safe_fname(fname), xflags,
+ fp ? "" : " [not found]");
+ }
+
if (!fp) {
if (xflags & XFLG_FATAL_ERRORS) {
rsyserr(FERROR, errno,
}
dirbuf[dirbuf_len] = '\0';
- if (verbose > 2) {
- rprintf(FINFO, "[%s] add_filter_file(%s,%d)\n",
- who_am_i(), safe_fname(fname), xflags);
- }
-
while (1) {
char *s = line;
int ch, overflow = 0;
fclose(fp);
}
+char *get_rule_prefix(int match_flags, const char *pat, unsigned int *plen_ptr)
+{
+ static char buf[MAX_RULE_PREFIX+1];
+ char *op = buf;
+
+ if (match_flags & MATCHFLG_PERDIR_MERGE) {
+ *op++ = ':';
+ if (match_flags & MATCHFLG_WORD_SPLIT)
+ *op++ = 's';
+ if (match_flags & MATCHFLG_NO_INHERIT)
+ *op++ = 'n';
+ if (match_flags & MATCHFLG_EXCLUDE_SELF)
+ *op++ = 'e';
+ if (match_flags & MATCHFLG_NO_PREFIXES) {
+ if (match_flags & MATCHFLG_INCLUDE)
+ *op++ = '+';
+ else
+ *op++ = '-';
+ }
+ *op++ = ' ';
+ } else if (match_flags & MATCHFLG_INCLUDE) {
+ *op++ = '+';
+ *op++ = ' ';
+ } else if (protocol_version >= 29
+ || ((*pat == '-' || *pat == '+') && pat[1] == ' ')) {
+ *op++ = '-';
+ *op++ = ' ';
+ }
+ *op = '\0';
+ if (plen_ptr)
+ *plen_ptr = op - buf;
+ if (op - buf > MAX_RULE_PREFIX)
+ overflow("get_rule_prefix");
+ return buf;
+}
void send_filter_list(int f)
{
add_filter(&filter_list, "/*/*", XFLG_DEF_EXCLUDE);
for (ent = filter_list.head; ent; ent = ent->next) {
- unsigned int l;
- char p[MAXPATHLEN+MAX_RULE_PREFIX+1];
+ unsigned int len, plen, dlen;
+ char *p;
- l = strlcpy(p, ent->pattern, sizeof p);
- if (l == 0 || l >= MAXPATHLEN)
+ len = strlen(ent->pattern);
+ if (len == 0 || len >= MAXPATHLEN)
continue;
- if (ent->match_flags & MATCHFLG_DIRECTORY) {
- p[l++] = '/';
- p[l] = '\0';
+ p = get_rule_prefix(ent->match_flags, ent->pattern, &plen);
+ if (protocol_version < 29 && *p == ':') {
+ if (strcmp(p, ":sn- ") == 0
+ && strcmp(ent->pattern, ".cvsignore") == 0)
+ continue;
+ rprintf(FERROR,
+ "remote rsync is too old to understand per-directory merge files.\n");
+ exit_cleanup(RERR_SYNTAX);
}
-
- if (ent->match_flags & MATCHFLG_PERDIR_MERGE) {
- char buf[MAX_RULE_PREFIX], *op = buf;
- if (protocol_version < 29) {
- rprintf(FERROR,
- "remote rsync is too old to understand per-directory merge files.\n");
- exit_cleanup(RERR_SYNTAX);
- }
- *op++ = ':';
- if (ent->match_flags & MATCHFLG_WORD_SPLIT)
- *op++ = 's';
- if (ent->match_flags & MATCHFLG_NO_INHERIT)
- *op++ = 'n';
- if (ent->match_flags & MATCHFLG_EXCLUDE_SELF)
- *op++ = 'e';
- if (ent->match_flags & MATCHFLG_NO_PREFIXES) {
- if (ent->match_flags & MATCHFLG_INCLUDE)
- *op++ = '+';
- else
- *op++ = '-';
- }
- *op++ = ' ';
- if (op - buf > MAX_RULE_PREFIX)
- overflow("send_filter_list");
- write_int(f, l + (op - buf));
- write_buf(f, buf, op - buf);
- } else if (ent->match_flags & MATCHFLG_INCLUDE) {
- write_int(f, l + 2);
- write_buf(f, "+ ", 2);
- } else if (protocol_version >= 29
- || ((*p == '-' || *p == '+') && p[1] == ' ')) {
- write_int(f, l + 2);
- write_buf(f, "- ", 2);
- } else
- write_int(f, l);
- write_buf(f, p, l);
+ dlen = ent->match_flags & MATCHFLG_DIRECTORY ? 1 : 0;
+ write_int(f, plen + len + dlen);
+ if (plen)
+ write_buf(f, p, plen);
+ write_buf(f, ent->pattern, len);
+ if (dlen)
+ write_byte(f, '/');
}
write_int(f, 0);
static unsigned int cvs_flags = XFLG_WORD_SPLIT | XFLG_NO_PREFIXES
| XFLG_DEF_EXCLUDE;
char fname[MAXPATHLEN];
- char *p;
+ char *p = module_id >= 0 && lp_use_chroot(module_id)
+ ? "/" : getenv("HOME");
add_filter(&filter_list, ":C", 0);
add_filter(&filter_list, default_cvsignore, cvs_flags);
- if ((p = getenv("HOME"))
- && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname) {
+ if (p && pathjoin(fname, MAXPATHLEN, p, ".cvsignore") < MAXPATHLEN) {
add_filter_file(&filter_list, fname, cvs_flags);
}