X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/651443a7ffd889f6c2092587b940ed369c9e99d0..a039749b4c21e3439dc06fcdd5355828f1f95463:/exclude.c diff --git a/exclude.c b/exclude.c index 444a2b48..cbf6105f 100644 --- a/exclude.c +++ b/exclude.c @@ -20,6 +20,8 @@ /* 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,50 +29,6 @@ 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) || delete_mode) - 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) { @@ -95,15 +53,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; - ret->fnmatch_flags = strstr(pattern, "**") ? 0 : FNM_PATHNAME; - } 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] == '/') { @@ -125,8 +86,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; @@ -145,40 +106,72 @@ 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 && 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 = exclude_list[n]; + if (check_one_exclude(name, ent, st)) { + report_exclude_result(name, ent, st); + return !ent->include; + } + } } return 0; @@ -199,8 +192,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; } @@ -229,7 +220,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; @@ -263,6 +257,12 @@ void send_exclude_list(int f) { int i; extern int remote_version; + extern int list_only, recurse; + + /* this is a complete hack - blame Rusty */ + if (list_only && !recurse) { + add_exclude("/*/*", 0); + } if (!exclude_list) { write_int(f,0); @@ -270,8 +270,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;