X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/b315601ce07701c4913c48a269775ab3284b25ba..87cc45e136333407acc6463f6415df4979289f30:/exclude.c diff --git a/exclude.c b/exclude.c index fefe2993..eba9f025 100644 --- a/exclude.c +++ b/exclude.c @@ -1,25 +1,29 @@ -/* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 - - 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. -*/ +/* -*- 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. + */ /* 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; @@ -27,8 +31,8 @@ extern int delete_mode; static struct exclude_struct **exclude_list; -/* build an exclude structure given a exclude pattern */ -static struct exclude_struct *make_exclude(char *pattern, int include) +/** Build an exclude structure given a exclude pattern */ +static struct exclude_struct *make_exclude(const char *pattern, int include) { struct exclude_struct *ret; @@ -51,8 +55,17 @@ static struct exclude_struct *make_exclude(char *pattern, int include) if (!ret->pattern) out_of_memory("make_exclude"); if (strpbrk(pattern, "*[?")) { - ret->regular_exp = 1; - ret->fnmatch_flags = strstr(pattern, "**") ? 0 : FNM_PATHNAME; + 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; + } } if (strlen(pattern) > 1 && pattern[strlen(pattern)-1] == '/') { @@ -74,11 +87,11 @@ static void free_exclude(struct exclude_struct *ex) free(ex); } -static int check_one_exclude(char *name,struct exclude_struct *ex, - STRUCT_STAT *st) +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,'/'))) @@ -94,47 +107,79 @@ static int check_one_exclude(char *name,struct exclude_struct *ex, } if (ex->regular_exp) { - if (fnmatch(pattern, name, ex->fnmatch_flags) == 0) + if (fnmatch(pattern, name, ex->fnmatch_flags) == 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 || (!match_start && name[l1-(l2+1)] == '/'))) { return 1; + } } return 0; } -int check_exclude(char *name,struct exclude_struct **local_exclude_list, +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 ? "/" : ""); +} + + +/* + * Return true if file NAME is defined to be excluded by either + * LOCAL_EXCLUDE_LIST or the globals EXCLUDE_LIST. + */ +int check_exclude(char *name, struct exclude_struct **local_exclude_list, STRUCT_STAT *st) { int n; + struct exclude_struct *ent; if (name && (name[0] == '.') && !name[1]) /* never exclude '.', even if somebody does --exclude '*' */ return 0; if (exclude_list) { - for (n=0; exclude_list[n]; n++) - if (check_one_exclude(name,exclude_list[n],st)) - return !exclude_list[n]->include; + for (n=0; exclude_list[n]; n++) { + ent = exclude_list[n]; + if (check_one_exclude(name, ent, st)) { + report_exclude_result(name, ent, st); + return !ent->include; + } + } } if (local_exclude_list) { - for (n=0; local_exclude_list[n]; n++) - if (check_one_exclude(name,local_exclude_list[n],st)) - return !local_exclude_list[n]->include; + for (n=0; local_exclude_list[n]; n++) { + ent = local_exclude_list[n]; + if (check_one_exclude(name, ent, st)) { + report_exclude_result(name, ent, st); + return !ent->include; + } + } } return 0; } -void add_exclude_list(char *pattern,struct exclude_struct ***list, int include) +void add_exclude_list(const char *pattern, struct exclude_struct ***list, int include) { int len=0; if (list && *list) @@ -152,53 +197,78 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include) } *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)\n",pattern); - + + if (verbose > 2) { + rprintf(FINFO,"add_exclude(%s,%s)\n",pattern, + include ? "include" : "exclude"); + } + (*list)[len+1] = NULL; } -void add_exclude(char *pattern, int include) +void add_exclude(const char *pattern, int include) { add_exclude_list(pattern,&exclude_list, include); } -struct exclude_struct **make_exclude_list(char *fname, +struct exclude_struct **make_exclude_list(const char *fname, struct exclude_struct **list1, int fatal, int include) { struct exclude_struct **list=list1; - FILE *f = fopen(fname,"r"); + int fd; char line[MAXPATHLEN]; - if (!f) { + char *eob = line + MAXPATHLEN - 1; + extern int eol_nulls; + + if (strcmp(fname, "-") != 0) + fd = open(fname, O_RDONLY|O_BINARY); + else + fd = 0; + if (fd < 0) { if (fatal) { - rprintf(FERROR,"%s : %s\n",fname,strerror(errno)); + rsyserr(FERROR, errno, + "failed to open %s file %s", + include ? "include" : "exclude", + fname); exit_cleanup(RERR_FILEIO); } return list; } - while (fgets(line,MAXPATHLEN,f)) { - int l = strlen(line); - if (l && line[l-1] == '\n') l--; - line[l] = 0; - if (line[0] && (line[0] != ';') && (line[0] != '#')) { + while (1) { + char ch, *s = line; + int cnt; + while (1) { + if ((cnt = read(fd, &ch, 1)) <= 0) { + if (cnt < 0 && errno == EINTR) + continue; + break; + } + if (eol_nulls? !ch : (ch == '\n' || ch == '\r')) + break; + if (s < eob) + *s++ = ch; + } + *s = '\0'; + if (*line && *line != ';' && *line != '#') { /* Skip lines starting with semicolon or pound. - It probably wouldn't cause any harm to not skip - them but there's no need to save them. */ + * It probably wouldn't cause any harm to not skip + * them but there's no need to save them. */ add_exclude_list(line,&list,include); } + if (cnt <= 0) + break; } - fclose(f); + close(fd); return list; } -void add_exclude_file(char *fname,int fatal,int include) +void add_exclude_file(const char *fname, int fatal, int include) { if (!fname || !*fname) return; @@ -210,6 +280,15 @@ void send_exclude_list(int f) { int i; extern int remote_version; + extern int list_only, recurse; + + /* This is a complete hack - blame Rusty. + * + * FIXME: This pattern shows up in the output of + * report_exclude_result(), which is not ideal. */ + if (list_only && !recurse) { + add_exclude("/*/*", 0); + } if (!exclude_list) { write_int(f,0); @@ -220,7 +299,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); @@ -236,7 +315,7 @@ void send_exclude_list(int f) write_int(f,l); } write_buf(f,pattern,l); - } + } write_int(f,0); } @@ -245,7 +324,8 @@ void send_exclude_list(int f) void recv_exclude_list(int f) { char line[MAXPATHLEN]; - int l; + unsigned int l; + while ((l=read_int(f))) { if (l >= MAXPATHLEN) overflow("recv_exclude_list"); read_sbuf(f,line,l); @@ -274,7 +354,7 @@ char *get_exclude_tok(char *p) return(NULL); /* Skip over any initial spaces */ - while(isspace(*s)) + while (isspace(* (unsigned char *) s)) s++; /* Are we at the end of the string? */ @@ -285,9 +365,9 @@ 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(*s) && *s!='\0') + while (!isspace(* (unsigned char *) s) && *s != '\0') s++; } else { t=NULL; @@ -301,14 +381,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); } @@ -326,12 +406,11 @@ void add_include_line(char *p) static char *cvs_ignore_list[] = { - "RCS","SCCS","CVS","CVS.adm","RCSLOG","cvslog.*", - "tags","TAGS",".make.state",".nse_depinfo", - "*~", "#*", ".#*", ",*", "*.old", "*.bak", "*.BAK", "*.orig", + "RCS/", "SCCS/", "CVS/", ".svn/", "CVS.adm", "RCSLOG", "cvslog.*", + "tags", "TAGS", ".make.state", ".nse_depinfo", + "*~", "#*", ".#*", ", *", "*.old", "*.bak", "*.BAK", "*.orig", "*.rej", ".del-*", "*.a", "*.o", "*.obj", "*.so", "*.Z", "*.elc", "*.ln", - "core",NULL}; - + "core", NULL}; void add_cvs_excludes(void) @@ -339,12 +418,12 @@ 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); if ((p=getenv("HOME")) && strlen(p) < (MAXPATHLEN-12)) { - slprintf(fname,sizeof(fname), "%s/.cvsignore",p); + snprintf(fname,sizeof(fname), "%s/.cvsignore",p); add_exclude_file(fname,0,0); }