extern int recurse;
extern int io_error;
extern int local_server;
+extern int prune_empty_dirs;
extern int delete_mode;
extern int delete_excluded;
extern int cvs_exclude;
/* If the pattern starts with **, note that. */
if (cp == ret->pattern)
mflags |= MATCHFLG_WILD2_PREFIX;
+ /* If the pattern ends with ***, note that. */
+ if (pat_len >= 3
+ && ret->pattern[pat_len-3] == '*'
+ && ret->pattern[pat_len-2] == '*'
+ && ret->pattern[pat_len-1] == '*')
+ mflags |= MATCHFLG_WILD3_SUFFIX;
}
}
}
if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) {
rprintf(FERROR, "merge-file name overflows: %s\n",
- safe_fname(merge_file));
+ merge_file);
return NULL;
}
} else {
goto done;
if (dirbuf_len + fn_len >= MAXPATHLEN) {
- rprintf(FERROR, "merge-file name overflows: %s\n",
- safe_fname(fn));
+ rprintf(FERROR, "merge-file name overflows: %s\n", fn);
return NULL;
}
memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip);
static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir)
{
- char *p, full_name[MAXPATHLEN];
- int anchored_match = 0;
+ int slash_handling, str_cnt = 0, anchored_match = 0;
int ret_match = ex->match_flags & MATCHFLG_NEGATE ? 0 : 1;
- char *pattern = ex->pattern;
+ char *p, *pattern = ex->pattern;
+ const char *strings[16]; /* more than enough */
if (!*name)
return 0;
&& curr_dir_len > module_dirlen + 1) {
/* If we're matching against an absolute-path pattern,
* we need to prepend our full path info. */
- pathjoin(full_name, sizeof full_name,
- curr_dir + module_dirlen + 1, name);
- name = full_name;
+ strings[str_cnt++] = curr_dir + module_dirlen + 1;
+ strings[str_cnt++] = "/";
+ } else if (ex->match_flags & MATCHFLG_WILD2_PREFIX && *name != '/') {
+ /* Allow "**"+"/" to match at the start of the string. */
+ strings[str_cnt++] = "/";
}
-
- if (ex->match_flags & MATCHFLG_DIRECTORY && !name_is_dir)
+ strings[str_cnt++] = name;
+ if (name_is_dir) {
+ /* Allow a trailing "/"+"***" to match the directory. */
+ if (ex->match_flags & MATCHFLG_WILD3_SUFFIX)
+ strings[str_cnt++] = "/";
+ } else if (ex->match_flags & MATCHFLG_DIRECTORY)
return !ret_match;
+ strings[str_cnt] = NULL;
if (*pattern == '/') {
anchored_match = 1;
pattern++;
- if (*name == '/')
- name++;
+ if (strings[0][0] == '/')
+ strings[0]++;
}
- if (ex->match_flags & MATCHFLG_WILD) {
+ if (!anchored_match && ex->u.slash_cnt
+ && !(ex->match_flags & MATCHFLG_WILD2)) {
/* A non-anchored match with an infix slash and no "**"
* needs to match the last slash_cnt+1 name elements. */
- if (!anchored_match && ex->u.slash_cnt
- && !(ex->match_flags & MATCHFLG_WILD2)) {
- int cnt = ex->u.slash_cnt + 1;
- for (p = name + strlen(name) - 1; p >= name; p--) {
- if (*p == '/' && !--cnt)
- break;
- }
- name = p+1;
- }
- if (wildmatch(pattern, name))
+ slash_handling = ex->u.slash_cnt + 1;
+ } else if (!anchored_match && !(ex->match_flags & MATCHFLG_WILD2_PREFIX)
+ && ex->match_flags & MATCHFLG_WILD2) {
+ /* A non-anchored match with an infix or trailing "**" (but not
+ * a prefixed "**") needs to try matching after every slash. */
+ slash_handling = -1;
+ } else {
+ /* The pattern matches only at the start of the path or name. */
+ slash_handling = 0;
+ }
+
+ if (ex->match_flags & MATCHFLG_WILD) {
+ if (wildmatch_array(pattern, strings, slash_handling))
+ return ret_match;
+ } else if (str_cnt > 1) {
+ if (litmatch_array(pattern, strings, slash_handling))
return ret_match;
- if (ex->match_flags & MATCHFLG_WILD2_PREFIX) {
- /* If the **-prefixed pattern has a '/' as the next
- * character, then try to match the rest of the
- * pattern at the root. */
- if (pattern[2] == '/' && wildmatch(pattern+3, name))
- return ret_match;
- } else if (!anchored_match && ex->match_flags & MATCHFLG_WILD2) {
- /* A non-anchored match with an infix or trailing "**"
- * (but not a prefixed "**") needs to try matching
- * after every slash. */
- while ((name = strchr(name, '/')) != NULL) {
- name++;
- if (wildmatch(pattern, name))
- return ret_match;
- }
- }
} else if (anchored_match) {
- if (strcmp(name,pattern) == 0)
+ if (strcmp(strings[0], pattern) == 0)
return ret_match;
} else {
int l1 = strlen(name);
* case we add it back in here. */
if (verbose >= 2) {
- rprintf(FINFO, "[%s] %scluding %s %s because of pattern %s%s%s\n",
- who_am_i(),
- ent->match_flags & MATCHFLG_INCLUDE ? "in" : "ex",
- name_is_dir ? "directory" : "file", name, ent->pattern,
- ent->match_flags & MATCHFLG_DIRECTORY ? "/" : "", type);
+ static char *actions[2][2]
+ = { {"show", "hid"}, {"risk", "protect"} };
+ const char *w = who_am_i();
+ rprintf(FINFO, "[%s] %sing %s %s because of pattern %s%s%s\n",
+ w, actions[*w!='s'][!(ent->match_flags&MATCHFLG_INCLUDE)],
+ name_is_dir ? "directory" : "file", name, ent->pattern,
+ ent->match_flags & MATCHFLG_DIRECTORY ? "/" : "", type);
}
}
if (verbose > 2) {
rprintf(FINFO, "[%s] parse_filter_file(%s,%x,%x)%s\n",
- who_am_i(), safe_fname(fname), mflags, xflags,
+ who_am_i(), fname, mflags, xflags,
fp ? "" : " [not found]");
}
rsyserr(FERROR, errno,
"failed to open %sclude file %s",
mflags & MATCHFLG_INCLUDE ? "in" : "ex",
- safe_fname(fname));
+ fname);
exit_cleanup(RERR_FILEIO);
}
return;
int ch, overflow = 0;
while (1) {
if ((ch = getc(fp)) == EOF) {
- if (ferror(fp) && errno == EINTR)
+ if (ferror(fp) && errno == EINTR) {
+ clearerr(fp);
continue;
+ }
break;
}
if (word_split && isspace(ch))
/* This is only called by the client. */
void send_filter_list(int f_out)
{
- int receiver_wants_list = delete_mode
- && (!delete_excluded || protocol_version >= 29);
+ int receiver_wants_list = prune_empty_dirs
+ || (delete_mode && (!delete_excluded || protocol_version >= 29));
if (local_server || (am_sender && !receiver_wants_list))
f_out = -1;
{
char line[BIGPATHBUFLEN];
int xflags = protocol_version >= 29 ? 0 : XFLG_OLD_PREFIXES;
- int receiver_wants_list = delete_mode
- && (!delete_excluded || protocol_version >= 29);
+ int receiver_wants_list = prune_empty_dirs
+ || (delete_mode
+ && (!delete_excluded || protocol_version >= 29));
unsigned int len;
if (!local_server && (am_sender || receiver_wants_list)) {
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff