X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/f167879035940c9bc30b687699fdd309e549b5f5..d3d07a5e860f1cde0e234ec7a1aff7111a2c514f:/exclude.c diff --git a/exclude.c b/exclude.c index 71bc3bda..027ea7a6 100644 --- a/exclude.c +++ b/exclude.c @@ -4,11 +4,11 @@ * Copyright (C) 1996-2001 Andrew Tridgell * Copyright (C) 1996 Paul Mackerras * Copyright (C) 2002 Martin Pool - * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison + * Copyright (C) 2003-2008 Wayne Davison * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, @@ -17,8 +17,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. + * with this program; if not, visit the http://fsf.org website. */ #include "rsync.h" @@ -27,11 +26,10 @@ extern int verbose; extern int am_server; extern int am_sender; extern int eol_nulls; -extern int list_only; -extern int recurse; extern int io_error; extern int local_server; extern int prune_empty_dirs; +extern int ignore_perishable; extern int delete_mode; extern int delete_excluded; extern int cvs_exclude; @@ -51,8 +49,8 @@ struct filter_list_struct server_filter_list = { 0, 0, " [daemon]" }; #define MAX_RULE_PREFIX (16) #define MODIFIERS_MERGE_FILE "-+Cenw" -#define MODIFIERS_INCL_EXCL "/!Crs" -#define MODIFIERS_HIDE_PROTECT "/!" +#define MODIFIERS_INCL_EXCL "/!Crsp" +#define MODIFIERS_HIDE_PROTECT "/!p" /* 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 @@ -144,9 +142,8 @@ static void add_rule(struct filter_list_struct *listp, const char *pat, } } - if (!(ret = new(struct filter_struct))) + if (!(ret = new0(struct filter_struct))) out_of_memory("add_rule"); - memset(ret, 0, sizeof ret[0]); if (!(mflags & (MATCHFLG_ABS_PATH | MATCHFLG_MERGE_FILE)) && ((xflags & (XFLG_ANCHORED2ABS|XFLG_ABS_IF_SLASH) && *pat == '/') @@ -298,29 +295,28 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr, strlcpy(to, merge_file, *len_ptr + 1); merge_file = to; } - if (!sanitize_path(fn, merge_file, r, dirbuf_depth, NULL)) { + if (!sanitize_path(fn, merge_file, r, dirbuf_depth)) { rprintf(FERROR, "merge-file name overflows: %s\n", merge_file); return NULL; } + fn_len = strlen(fn); } else { strlcpy(fn, merge_file, len_ptr ? *len_ptr + 1 : MAXPATHLEN); - clean_fname(fn, 1); + fn_len = clean_fname(fn, CFN_COLLAPSE_DOT_DOT_DIRS); } - fn_len = strlen(fn); - if (fn == buf) - goto done; - - if (dirbuf_len + fn_len >= MAXPATHLEN) { - rprintf(FERROR, "merge-file name overflows: %s\n", fn); - return NULL; + /* If the name isn't in buf yet, it's wasn't absolute. */ + if (fn != buf) { + if (dirbuf_len + fn_len >= MAXPATHLEN) { + rprintf(FERROR, "merge-file name overflows: %s\n", fn); + return NULL; + } + memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip); + memcpy(buf + dirbuf_len - prefix_skip, fn, fn_len + 1); + fn_len = clean_fname(buf, CFN_COLLAPSE_DOT_DOT_DIRS); } - memcpy(buf, dirbuf + prefix_skip, dirbuf_len - prefix_skip); - memcpy(buf + dirbuf_len - prefix_skip, fn, fn_len + 1); - fn_len = clean_fname(buf, 1); - done: if (len_ptr) *len_ptr = fn_len; return buf; @@ -340,7 +336,7 @@ void set_filter_dir(const char *dir, unsigned int dirlen) len = 0; memcpy(dirbuf + len, dir, dirlen); dirbuf[dirlen + len] = '\0'; - dirbuf_len = clean_fname(dirbuf, 1); + dirbuf_len = clean_fname(dirbuf, CFN_COLLAPSE_DOT_DOT_DIRS); if (dirbuf_len > 1 && dirbuf[dirbuf_len-1] == '.' && dirbuf[dirbuf_len-2] == '/') dirbuf_len -= 2; @@ -376,7 +372,7 @@ static BOOL setup_merge_file(struct filter_struct *ex, else pathjoin(buf, MAXPATHLEN, dirbuf, x); - len = clean_fname(buf, 1); + len = clean_fname(buf, CFN_COLLAPSE_DOT_DOT_DIRS); if (len != 1 && len < MAXPATHLEN-1) { buf[len++] = '/'; buf[len] = '\0'; @@ -493,15 +489,42 @@ void pop_local_filters(void *mem) free(pop); } -static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir) +void change_local_filter_dir(const char *dname, int dlen, int dir_depth) +{ + static int cur_depth = -1; + static void *filt_array[MAXPATHLEN/2+1]; + + if (!dname) { + for ( ; cur_depth >= 0; cur_depth--) { + if (filt_array[cur_depth]) { + pop_local_filters(filt_array[cur_depth]); + filt_array[cur_depth] = NULL; + } + } + return; + } + + assert(dir_depth < MAXPATHLEN/2+1); + + for ( ; cur_depth >= dir_depth; cur_depth--) { + if (filt_array[cur_depth]) { + pop_local_filters(filt_array[cur_depth]); + filt_array[cur_depth] = NULL; + } + } + + cur_depth = dir_depth; + filt_array[cur_depth] = push_local_filters(dname, dlen); +} + +static int rule_matches(char *fname, struct filter_struct *ex, int name_is_dir) { int slash_handling, str_cnt = 0, anchored_match = 0; int ret_match = ex->match_flags & MATCHFLG_NEGATE ? 0 : 1; char *p, *pattern = ex->pattern; const char *strings[16]; /* more than enough */ + char *name = fname + (*fname == '/'); - if (*name == '/') - name++; if (!*name) return 0; @@ -511,13 +534,13 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir) * just match the name portion of the path. */ if ((p = strrchr(name,'/')) != NULL) name = p+1; - } else if (ex->match_flags & MATCHFLG_ABS_PATH && *name != '/' + } else if (ex->match_flags & MATCHFLG_ABS_PATH && *fname != '/' && curr_dir_len > module_dirlen + 1) { /* If we're matching against an absolute-path pattern, * we need to prepend our full path info. */ strings[str_cnt++] = curr_dir + module_dirlen + 1; strings[str_cnt++] = "/"; - } else if (ex->match_flags & MATCHFLG_WILD2_PREFIX && *name != '/') { + } else if (ex->match_flags & MATCHFLG_WILD2_PREFIX && *fname != '/') { /* Allow "**"+"/" to match at the start of the string. */ strings[str_cnt++] = "/"; } @@ -557,7 +580,7 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir) if (litmatch_array(pattern, strings, slash_handling)) return ret_match; } else if (anchored_match) { - if (strcmp(strings[0], pattern) == 0) + if (strcmp(name, pattern) == 0) return ret_match; } else { int l1 = strlen(name); @@ -602,6 +625,8 @@ int check_filter(struct filter_list_struct *listp, char *name, int name_is_dir) struct filter_struct *ent; for (ent = listp->head; ent; ent = ent->next) { + if (ignore_perishable && ent->match_flags & MATCHFLG_PERISHABLE) + continue; if (ent->match_flags & MATCHFLG_PERDIR_MERGE) { int rc = check_filter(ent->u.mergelist, name, name_is_dir); @@ -809,6 +834,9 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, case 'n': new_mflags |= MATCHFLG_NO_INHERIT; break; + case 'p': + new_mflags |= MATCHFLG_PERISHABLE; + break; case 'r': new_mflags |= MATCHFLG_RECEIVER_SIDE; break; @@ -848,11 +876,12 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, } /* --delete-excluded turns an un-modified include/exclude into a - * sender-side rule. We also affect a per-dir .cvsignore file so - * that we are compatible with older protocol versions. */ + * sender-side rule. We also affect per-dir merge files that take + * no prefixes as a simple optimization. */ if (delete_excluded && !(new_mflags & (MATCHFLG_RECEIVER_SIDE|MATCHFLG_SENDER_SIDE)) - && (!(new_mflags & MATCHFLG_PERDIR_MERGE) || new_mflags & MATCHFLG_CVS_IGNORE)) + && (!(new_mflags & MATCHFLG_PERDIR_MERGE) + || new_mflags & MATCHFLG_NO_PREFIXES)) new_mflags |= MATCHFLG_SENDER_SIDE; *len_ptr = len; @@ -869,18 +898,20 @@ static char default_cvsignore[] = " *.a *.olb *.o *.obj *.so *.exe" " *.Z *.elc *.ln core" /* The rest we added to suit ourself. */ - " .svn/ .bzr/"; + " .svn/ .git/ .bzr/"; static void get_cvs_excludes(uint32 mflags) { - char *p, fname[MAXPATHLEN]; static int initialized = 0; + char *p, fname[MAXPATHLEN]; if (initialized) return; initialized = 1; - parse_rule(&cvs_filter_list, default_cvsignore, mflags, 0); + parse_rule(&cvs_filter_list, default_cvsignore, + mflags | (protocol_version >= 30 ? MATCHFLG_PERISHABLE : 0), + 0); p = module_id >= 0 && lp_use_chroot(module_id) ? "/" : getenv("HOME"); if (p && pathjoin(fname, MAXPATHLEN, p, ".cvsignore") < MAXPATHLEN) @@ -906,12 +937,14 @@ void parse_rule(struct filter_list_struct *listp, const char *pattern, &pat_len, &new_mflags); if (!cp) break; + + pattern = cp + pat_len; + if (pat_len >= MAXPATHLEN) { - rprintf(FERROR, "discarding over-long filter: %s\n", - cp); + rprintf(FERROR, "discarding over-long filter: %.*s\n", + (int)pat_len, cp); continue; } - pattern = cp + pat_len; if (new_mflags & MATCHFLG_CLEAR_LIST) { if (verbose > 2) { @@ -931,11 +964,9 @@ void parse_rule(struct filter_list_struct *listp, const char *pattern, } len = pat_len; if (new_mflags & MATCHFLG_EXCLUDE_SELF) { - const char *name = strrchr(cp, '/'); - if (name) - len -= ++name - cp; - else - name = cp; + const char *name = cp + len; + while (name > cp && name[-1] != '/') name--; + len -= name - cp; add_rule(listp, name, len, 0, 0); new_mflags &= ~MATCHFLG_EXCLUDE_SELF; len = pat_len; @@ -980,7 +1011,7 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname, if (*fname != '-' || fname[1] || am_server) { if (server_filter_list.head) { strlcpy(line, fname, sizeof line); - clean_fname(line, 1); + clean_fname(line, CFN_COLLAPSE_DOT_DOT_DIRS); if (check_filter(&server_filter_list, line, 0) < 0) fp = NULL; else @@ -1064,6 +1095,8 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer, else legal_len = 0; + if (match_flags & MATCHFLG_NEGATE) + *op++ = '!'; if (match_flags & MATCHFLG_CVS_IGNORE) *op++ = 'C'; else { @@ -1087,6 +1120,12 @@ char *get_rule_prefix(int match_flags, const char *pat, int for_xfer, && (!for_xfer || protocol_version >= 29 || (delete_excluded && am_sender))) *op++ = 'r'; + if (match_flags & MATCHFLG_PERISHABLE) { + if (!for_xfer || protocol_version >= 30) + *op++ = 'p'; + else if (am_sender) + return NULL; + } if (op - buf > legal_len) return NULL; if (legal_len) @@ -1108,13 +1147,18 @@ static void send_rules(int f_out, struct filter_list_struct *flp) /* Note we need to check delete_excluded here in addition to * the code in parse_rule_tok() because some rules may have - * been added before we found the --delete-excluded option. */ + * been added before we found the --delete-excluded option. + * We must also elide any CVS merge-file rules to avoid a + * backward compatibility problem, and we elide any no-prefix + * merge files as an optimization (since they can only have + * include/exclude rules). */ 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 - && (!(ent->match_flags & MATCHFLG_PERDIR_MERGE) || ent->match_flags & MATCHFLG_CVS_IGNORE)) + && (!(ent->match_flags & MATCHFLG_PERDIR_MERGE) + || ent->match_flags & MATCHFLG_NO_PREFIXES)) elide = am_sender ? 1 : -1; if (elide < 0) { if (prev) @@ -1136,7 +1180,7 @@ static void send_rules(int f_out, struct filter_list_struct *flp) if (!p) { rprintf(FERROR, "filter rules are too modern for remote rsync.\n"); - exit_cleanup(RERR_SYNTAX); + exit_cleanup(RERR_PROTOCOL); } if (f_out < 0) continue; @@ -1168,11 +1212,6 @@ void send_filter_list(int f_out) parse_rule(&filter_list, "-C", 0, 0); } - /* This is a complete hack - blame Rusty. FIXME! - * Remove this hack when older rsyncs (below 2.6.4) are gone. */ - if (list_only == 1 && !recurse) - parse_rule(&filter_list, "/*/*", MATCHFLG_NO_PREFIXES, 0); - send_rules(f_out, &filter_list); if (f_out >= 0)