X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/e257c6c20b7ab5dc2a33ffa0297ed92484f8d507..798cde474f15ecb653c13249f85da6cb6587893d:/exclude.c diff --git a/exclude.c b/exclude.c index c6d9ec89..38bbd0cb 100644 --- a/exclude.c +++ b/exclude.c @@ -1,8 +1,10 @@ -/* -*- c-file-style: "linux" -*- +/* + * The filter include/exclude routines. * - * Copyright (C) 1996-2001 by Andrew Tridgell - * Copyright (C) 1996 by Paul Mackerras - * Copyright (C) 2002 by Martin Pool + * Copyright (C) 1996-2001 Andrew Tridgell + * Copyright (C) 1996 Paul Mackerras + * Copyright (C) 2002 Martin Pool + * Copyright (C) 2003, 2004, 2005, 2006 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 @@ -14,16 +16,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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. */ -/* a lot of this stuff was originally derived from GNU tar, although - it has now changed so much that it is hard to tell :) */ - -/* include/exclude cluestick added by Martin Pool */ - #include "rsync.h" extern int verbose; @@ -301,29 +298,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)) { + if (!sanitize_path(fn, merge_file, r, dirbuf_depth, NULL)) { 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, 1); } - - 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, 1); } - 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; @@ -503,6 +499,8 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir) char *p, *pattern = ex->pattern; const char *strings[16]; /* more than enough */ + if (*name == '/') + name++; if (!*name) return 0; @@ -534,8 +532,6 @@ static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir) if (*pattern == '/') { anchored_match = 1; pattern++; - if (strings[0][0] == '/') - strings[0]++; } if (!anchored_match && ex->u.slash_cnt @@ -560,7 +556,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); @@ -850,13 +846,22 @@ static const char *parse_rule_tok(const char *p, uint32 mflags, int xflags, exit_cleanup(RERR_SYNTAX); } + /* --delete-excluded turns an un-modified include/exclude into a + * 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_NO_PREFIXES)) + new_mflags |= MATCHFLG_SENDER_SIDE; + *len_ptr = len; *mflags_ptr = new_mflags; return (const char *)s; } -static char default_cvsignore[] = +static char default_cvsignore[] = /* These default ignored items come from the CVS manual. */ "RCS SCCS CVS CVS.adm RCSLOG cvslog.* tags TAGS" " .make.state .nse_depinfo *~ #* .#* ,* _$* *$" @@ -864,7 +869,7 @@ static char default_cvsignore[] = " *.a *.olb *.o *.obj *.so *.exe" " *.Z *.elc *.ln core" /* The rest we added to suit ourself. */ - " .svn/"; + " .svn/ .bzr/"; static void get_cvs_excludes(uint32 mflags) { @@ -1101,11 +1106,20 @@ static void send_rules(int f_out, struct filter_list_struct *flp) int elide = 0; char *p; + /* 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. + * 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) + else if (delete_excluded && !elide + && (!(ent->match_flags & MATCHFLG_PERDIR_MERGE) + || ent->match_flags & MATCHFLG_NO_PREFIXES)) elide = am_sender ? 1 : -1; if (elide < 0) { if (prev)