X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/19c14f987e69bc23ff9ba1d6f292094aafecae17..fcb69e5cdcfdfd0bdcea2127e5f4c9133a2282b9:/exclude.c diff --git a/exclude.c b/exclude.c index 15fa4f60..55c48a1a 100644 --- a/exclude.c +++ b/exclude.c @@ -1,6 +1,7 @@ -/* - Copyright (C) Andrew Tridgell 1996 - Copyright (C) Paul Mackerras 1996 +/* -*- c-file-style: "linux" -*- + + Copyright (C) 1996-2001 by Andrew Tridgell + Copyright (C) 1996 by Paul Mackerras 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 @@ -20,58 +21,17 @@ /* 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; +extern int delete_mode; static struct exclude_struct **exclude_list; -/* - * Optimization for special case when all included files are explicitly - * listed without wildcards in the "exclude" list followed by a "- *" - * to exclude the rest. - * Contributed by Dave Dykstra - */ -static int only_included_files = 1; -static struct exclude_struct *exclude_the_rest; - -int send_included_file_names(int f,struct file_list *flist) -{ - struct exclude_struct *ex, **ex_list; - int n; - char *p; - - if (!only_included_files || (exclude_the_rest == NULL)) - return 0; - - if (verbose > 1) { - rprintf(FINFO,"(using include-only optimization) "); - } - - /* set exclude_list to NULL temporarily so check_exclude */ - /* will always return true */ - ex_list = exclude_list; - exclude_list = NULL; - for (n=0; (ex = ex_list[n]) != NULL; n++) { - if (ex == exclude_the_rest) - break; - p = ex->pattern; - while (*p == '/') { - /* skip the allowed beginning slashes */ - p++; - } - /* silently skip files that don't exist to - be more like non-optimized case */ - if (access(p,0) == 0) - send_file_name(f,flist,p,0,0); - } - exclude_list = ex_list; - - return 1; -} - /* build an exclude structure given a exclude pattern */ -static struct exclude_struct *make_exclude(char *pattern, int include) +static struct exclude_struct *make_exclude(const char *pattern, int include) { struct exclude_struct *ret; @@ -94,14 +54,18 @@ static struct exclude_struct *make_exclude(char *pattern, int include) if (!ret->pattern) out_of_memory("make_exclude"); if (strpbrk(pattern, "*[?")) { - if (!ret->include && (*pattern == '*') && (*(pattern+1) == '\0')) { - exclude_the_rest = ret; - } else { - only_included_files = 0; - } ret->regular_exp = 1; - } else if (!ret->include) { - only_included_files = 0; + 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] == '/') { @@ -123,8 +87,8 @@ 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; @@ -143,47 +107,79 @@ static int check_one_exclude(char *name,struct exclude_struct *ex, } if (ex->regular_exp) { - if (fnmatch(pattern, name, 0) == 0) + if (fnmatch(pattern, name, ex->fnmatch_flags) == 0) { return 1; + } } else { int l1 = strlen(name); int l2 = strlen(pattern); 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) @@ -197,8 +193,6 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include) } free((*list)); *list = NULL; - only_included_files = 1; - exclude_the_rest = NULL; return; } @@ -207,18 +201,20 @@ void add_exclude_list(char *pattern,struct exclude_struct ***list, int include) 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) { @@ -227,7 +223,10 @@ struct exclude_struct **make_exclude_list(char *fname, char line[MAXPATHLEN]; if (!f) { 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; @@ -249,7 +248,7 @@ struct exclude_struct **make_exclude_list(char *fname, } -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; @@ -261,6 +260,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); @@ -268,8 +276,11 @@ void send_exclude_list(int f) } for (i=0;exclude_list[i];i++) { - char *pattern = exclude_list[i]->pattern; int l; + char pattern[MAXPATHLEN]; + + strlcpy(pattern,exclude_list[i]->pattern,sizeof(pattern)); + if (exclude_list[i]->directory) strlcat(pattern,"/", sizeof(pattern)); l = strlen(pattern); if (l == 0) continue; @@ -293,7 +304,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); @@ -301,14 +313,62 @@ void recv_exclude_list(int f) } } +/* Get the next include/exclude arg from the string. It works in a similar way +** to strtok - initially an arg is sent over, from then on NULL. This +** routine takes into account any +/- in the strings and does not +** consider the space following it as a delimeter. +*/ +char *get_exclude_tok(char *p) +{ + static char *s; + static int more; + char *t; + + if (p) { + s=p; + if (*p) + more=1; + } + + if (!more) + return(NULL); + + /* Skip over any initial spaces */ + while(isspace(*s)) + s++; + /* Are we at the end of the string? */ + if (*s) { + /* remember the beginning of the token */ + t=s; + + /* 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') + s++; + } else { + t=NULL; + } + + /* Have we reached the end of the string? */ + if (*s) + *s++='\0'; + else + more=0; + 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=strtok(p," "); tok; tok=strtok(NULL," ")) + for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL)) add_exclude(tok, 0); free(p); } @@ -319,7 +379,7 @@ void add_include_line(char *p) if (!p || !*p) return; p = strdup(p); if (!p) out_of_memory("add_include_line"); - for (tok=strtok(p," "); tok; tok=strtok(NULL," ")) + for (tok=get_exclude_tok(p); tok; tok=get_exclude_tok(NULL)) add_exclude(tok, 1); free(p); } @@ -344,7 +404,7 @@ void add_cvs_excludes(void) 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); }