X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ccdff3ebbf44fc386fc146cf34530d4b95e28bc2..170381c0524611c671d68e1ac3c690f4b4811389:/exclude.c diff --git a/exclude.c b/exclude.c index d5680ea1..135f6cae 100644 --- a/exclude.c +++ b/exclude.c @@ -1,19 +1,19 @@ /* -*- c-file-style: "linux" -*- - * + * * Copyright (C) 1996-2001 by Andrew Tridgell * Copyright (C) 1996 by Paul Mackerras * Copyright (C) 2002 by Martin Pool - * + * * 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 * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * 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. @@ -35,6 +35,7 @@ static struct exclude_struct **exclude_list; static struct exclude_struct *make_exclude(const char *pattern, int include) { struct exclude_struct *ret; + char *cp; ret = (struct exclude_struct *)malloc(sizeof(*ret)); if (!ret) out_of_memory("make_exclude"); @@ -55,18 +56,19 @@ static struct exclude_struct *make_exclude(const char *pattern, int include) if (!ret->pattern) out_of_memory("make_exclude"); if (strpbrk(pattern, "*[?")) { - ret->regular_exp = 1; - ret->fnmatch_flags = FNM_PATHNAME; - if (strstr(pattern, "**")) { - static int tested; - if (!tested) { - tested = 1; - if (fnmatch("a/b/*", "a/b/c/d", FNM_PATHNAME)==0) { - rprintf(FERROR,"WARNING: fnmatch FNM_PATHNAME is broken on your system\n"); - } - } - ret->fnmatch_flags = 0; - } + ret->match_flags |= MATCHFLG_WILD; + if (strstr(pattern, "**")) { + static int tested; + if (!tested) { + tested = 1; + if (fnmatch("a/b/*","a/b/c/d",FNM_PATHNAME)==0) + rprintf(FERROR,"WARNING: fnmatch FNM_PATHNAME is broken on your system\n"); + } + ret->match_flags |= MATCHFLG_WILD2; + /* If the pattern starts with **, note that. */ + if (*pattern == '*' && pattern[1] == '*') + ret->match_flags |= MATCHFLG_WILD2_PREFIX; + } } if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') { @@ -74,9 +76,8 @@ static struct exclude_struct *make_exclude(const char *pattern, int include) ret->directory = 1; } - if (!strchr(ret->pattern,'/')) { - ret->local = 1; - } + for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++) + ret->slash_cnt++; return ret; } @@ -92,31 +93,70 @@ static int check_one_exclude(char *name, struct exclude_struct *ex, STRUCT_STAT *st) { char *p; - int match_start=0; + int match_start = 0; char *pattern = ex->pattern; - if (ex->local && (p=strrchr(name,'/'))) + /* If the pattern does not have any slashes AND it does not have + * a "**" (which could match a slash), then we just match the + * name portion of the path. */ + if (!ex->slash_cnt && !(ex->match_flags & MATCHFLG_WILD2) && + (p = strrchr(name,'/')) != NULL) name = p+1; if (!name[0]) return 0; if (ex->directory && !S_ISDIR(st->st_mode)) return 0; - if (*pattern == '/' && *name != '/') { + if (*pattern == '/') { match_start = 1; pattern++; + if (*name == '/') + name++; } - if (ex->regular_exp) { - if (fnmatch(pattern, name, ex->fnmatch_flags) == 0) { + if (ex->match_flags & MATCHFLG_WILD) { + int fnmatch_flags = (ex->match_flags & MATCHFLG_WILD2)? + 0 : FNM_PATHNAME; + /* A non-anchored match with an infix slash and no "**" + * needs to match the last slash_cnt+1 name elements. */ + if (!match_start && ex->slash_cnt && + !(ex->match_flags & MATCHFLG_WILD2)) { + int cnt = ex->slash_cnt + 1; + for (p = name + strlen(name) - 1; p >= name; p--) { + if (*p == '/' && !--cnt) + break; + } + name = p+1; + } + if (fnmatch(pattern, name, fnmatch_flags) == 0) return 1; + 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] == '/' && + fnmatch(pattern+3, name, fnmatch_flags) == 0) + return 1; } + else if (!match_start && 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 (fnmatch(pattern, name, fnmatch_flags) == 0) + return 1; + } + } + } else if (match_start) { + if (strcmp(name,pattern) == 0) + return 1; } else { int l1 = strlen(name); int l2 = strlen(pattern); - if (l2 <= l1 && + if (l2 <= l1 && strcmp(name+(l1-l2),pattern) == 0 && - (l1==l2 || (!match_start && name[l1-(l2+1)] == '/'))) { + (l1==l2 || name[l1-(l2+1)] == '/')) { return 1; } } @@ -129,16 +169,16 @@ static void report_exclude_result(char const *name, struct exclude_struct const *ent, STRUCT_STAT const *st) { - /* If a trailing slash is present to match only directories, - * then it is stripped out by make_exclude. So as a special - * case we add it back in here. */ - - if (verbose >= 2) - rprintf(FINFO, "%s %s %s because of pattern %s%s\n", - ent->include ? "including" : "excluding", - S_ISDIR(st->st_mode) ? "directory" : "file", - name, ent->pattern, - ent->directory ? "/" : ""); + /* If a trailing slash is present to match only directories, + * then it is stripped out by make_exclude. So as a special + * case we add it back in here. */ + + if (verbose >= 2) + rprintf(FINFO, "%s %s %s because of pattern %s%s\n", + ent->include ? "including" : "excluding", + S_ISDIR(st->st_mode) ? "directory" : "file", + name, ent->pattern, + ent->directory ? "/" : ""); } @@ -150,7 +190,7 @@ int check_exclude(char *name, struct exclude_struct **local_exclude_list, STRUCT_STAT *st) { int n; - struct exclude_struct *ent; + struct exclude_struct *ent; if (name && (name[0] == '.') && !name[1]) /* never exclude '.', even if somebody does --exclude '*' */ @@ -158,22 +198,22 @@ int check_exclude(char *name, struct exclude_struct **local_exclude_list, if (exclude_list) { for (n=0; exclude_list[n]; n++) { - ent = exclude_list[n]; + ent = exclude_list[n]; if (check_one_exclude(name, ent, st)) { - report_exclude_result(name, ent, st); + report_exclude_result(name, ent, st); return !ent->include; - } - } + } + } } if (local_exclude_list) { for (n=0; local_exclude_list[n]; n++) { - ent = local_exclude_list[n]; + ent = local_exclude_list[n]; if (check_one_exclude(name, ent, st)) { - report_exclude_result(name, ent, st); + report_exclude_result(name, ent, st); return !ent->include; - } - } + } + } } return 0; @@ -198,13 +238,13 @@ void add_exclude_list(const char *pattern, struct exclude_struct ***list, int in } *list = (struct exclude_struct **)Realloc(*list,sizeof(struct exclude_struct *)*(len+2)); - + if (!*list || !((*list)[len] = make_exclude(pattern, include))) out_of_memory("add_exclude"); - + if (verbose > 2) { rprintf(FINFO,"add_exclude(%s,%s)\n",pattern, - include ? "include" : "exclude"); + include ? "include" : "exclude"); } (*list)[len+1] = NULL; @@ -232,9 +272,9 @@ struct exclude_struct **make_exclude_list(const char *fname, if (fd < 0) { if (fatal) { rsyserr(FERROR, errno, - "failed to open %s file %s", - include ? "include" : "exclude", - fname); + "failed to open %s file %s", + include ? "include" : "exclude", + fname); exit_cleanup(RERR_FILEIO); } return list; @@ -300,7 +340,7 @@ void send_exclude_list(int f) int l; char pattern[MAXPATHLEN]; - strlcpy(pattern,exclude_list[i]->pattern,sizeof(pattern)); + strlcpy(pattern,exclude_list[i]->pattern,sizeof(pattern)); if (exclude_list[i]->directory) strlcat(pattern,"/", sizeof(pattern)); l = strlen(pattern); @@ -316,7 +356,7 @@ void send_exclude_list(int f) write_int(f,l); } write_buf(f,pattern,l); - } + } write_int(f,0); } @@ -366,7 +406,7 @@ char *get_exclude_tok(char *p) /* Is this a '+' or '-' followed by a space (not whitespace)? */ if ((*s=='+' || *s=='-') && *(s+1)==' ') s+=2; - + /* Skip to the next space or the end of the string */ while (!isspace(* (unsigned char *) s) && *s != '\0') s++; @@ -382,14 +422,14 @@ char *get_exclude_tok(char *p) return(t); } - + void add_exclude_line(char *p) { char *tok; if (!p || !*p) return; p = strdup(p); if (!p) out_of_memory("add_exclude_line"); - for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL)) + for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL)) add_exclude(tok, 0); free(p); } @@ -419,7 +459,7 @@ void add_cvs_excludes(void) char fname[MAXPATHLEN]; char *p; int i; - + for (i=0; cvs_ignore_list[i]; i++) add_exclude(cvs_ignore_list[i], 0);