From 7842418b7b87c4c78ad8ad06fec44150c8aa0956 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Tue, 25 Jan 2005 10:39:14 +0000 Subject: [PATCH] Renamed several exclude-related functions/variables using new filter terminology. --- backup.c | 2 +- batch.c | 14 ++-- clientserver.c | 26 +++---- exclude.c | 193 ++++++++++++++++++++++++------------------------- flist.c | 56 +++++++------- generator.c | 10 +-- main.c | 8 +- options.c | 42 +++++------ receiver.c | 6 +- rsync.h | 18 ++--- t_stub.c | 4 +- util.c | 16 ++-- 12 files changed, 196 insertions(+), 199 deletions(-) diff --git a/backup.c b/backup.c index c909a940..689bfad5 100644 --- a/backup.c +++ b/backup.c @@ -165,7 +165,7 @@ static int keep_backup(char *fname) if (do_lstat(fname, &st) < 0) return 1; - if (!(file = make_file(fname, NULL, NO_EXCLUDES))) + if (!(file = make_file(fname, NULL, NO_FILTERS))) return 1; /* the file could have disappeared */ if (!(buf = get_backup_name(fname))) diff --git a/batch.c b/batch.c index a8c21769..e731d9f1 100644 --- a/batch.c +++ b/batch.c @@ -18,7 +18,7 @@ extern int preserve_uid; extern int preserve_gid; extern int always_checksum; -extern struct exclude_list_struct exclude_list; +extern struct filter_list_struct filter_list; static int *flag_ptr[] = { &recurse, @@ -95,12 +95,12 @@ static void write_arg(int fd, char *arg) write(fd, arg, strlen(arg)); } -static void write_excludes(int fd) +static void write_filters(int fd) { - struct exclude_struct *ent; + struct filter_struct *ent; write_sbuf(fd, " <<'#E#'\n"); - for (ent = exclude_list.head; ent; ent = ent->next) { + for (ent = filter_list.head; ent; ent = ent->next) { char *p = ent->pattern; if (ent->match_flags & MATCHFLG_INCLUDE) write_buf(fd, "+ ", 2); @@ -138,7 +138,7 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt) /* Write argvs info to BATCH.sh file */ write_arg(fd, argv[0]); - if (exclude_list.head) + if (filter_list.head) write_sbuf(fd, " --exclude-from=-"); for (i = 1; i < argc - file_arg_cnt; i++) { p = argv[i]; @@ -167,8 +167,8 @@ void write_batch_shell_file(int argc, char *argv[], int file_arg_cnt) write(fd, " ${1:-", 6); write_arg(fd, p); write_byte(fd, '}'); - if (exclude_list.head) - write_excludes(fd); + if (filter_list.head) + write_filters(fd); if (write(fd, "\n", 1) != 1 || close(fd) < 0) { rsyserr(FERROR, errno, "Batch file %s write error", filename); exit_cleanup(1); diff --git a/clientserver.c b/clientserver.c index 76b45557..447e1fb5 100644 --- a/clientserver.c +++ b/clientserver.c @@ -48,7 +48,7 @@ extern int orig_umask; extern int no_detach; extern int default_af_hint; extern char *bind_address; -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct server_filter_list; extern char *config_file; extern char *files_from; @@ -314,31 +314,31 @@ static int rsync_module(int f_in, int f_out, int i) if (use_chroot) { module_dirlen = 0; - set_excludes_dir("/", 1); + set_filter_dir("/", 1); } else { module_dirlen = strlen(lp_path(i)); - set_excludes_dir(lp_path(i), module_dirlen); + set_filter_dir(lp_path(i), module_dirlen); } p = lp_filter(i); - add_exclude(&server_exclude_list, p, - XFLG_WORD_SPLIT | XFLG_ABS_PATH); + add_filter(&server_filter_list, p, + XFLG_WORD_SPLIT | XFLG_ABS_PATH); p = lp_include_from(i); - add_exclude_file(&server_exclude_list, p, - XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE); + add_filter_file(&server_filter_list, p, + XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_INCLUDE); p = lp_include(i); - add_exclude(&server_exclude_list, p, - XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE); + add_filter(&server_filter_list, p, + XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_INCLUDE); p = lp_exclude_from(i); - add_exclude_file(&server_exclude_list, p, - XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); + add_filter_file(&server_filter_list, p, + XFLG_FATAL_ERRORS | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); p = lp_exclude(i); - add_exclude(&server_exclude_list, p, - XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); + add_filter(&server_filter_list, p, + XFLG_WORD_SPLIT | XFLG_ABS_PATH | XFLG_DEF_EXCLUDE); log_init(); diff --git a/exclude.c b/exclude.c index 10f246e0..0d703369 100644 --- a/exclude.c +++ b/exclude.c @@ -38,13 +38,13 @@ extern char curr_dir[]; extern unsigned int curr_dir_len; extern unsigned int module_dirlen; -struct exclude_list_struct exclude_list = { 0, 0, "" }; -struct exclude_list_struct server_exclude_list = { 0, 0, "server " }; +struct filter_list_struct filter_list = { 0, 0, "" }; +struct filter_list_struct server_filter_list = { 0, 0, "server " }; /* Need room enough for ":MODS " prefix plus some room to grow. */ -#define MAX_EXCLUDE_PREFIX (16) +#define MAX_RULE_PREFIX (16) -/* The dirbuf is set by push_local_excludes() to the current subdirectory +/* The dirbuf is set by push_local_filters() to the current subdirectory * relative to curr_dir that is being processed. The path always has a * trailing slash appended, and the variable dirbuf_len contains the length * of this path prefix. The path is always absolute. */ @@ -58,11 +58,11 @@ static BOOL parent_dirscan = False; /* This array contains a list of all the currently active per-dir merge * files. This makes it easier to save the appropriate values when we * "push" down into each subdirectory. */ -static struct exclude_struct **mergelist_parents; +static struct filter_struct **mergelist_parents; static int mergelist_cnt = 0; static int mergelist_size = 0; -/* Each exclude_list_struct describes a singly-linked list by keeping track +/* Each filter_list_struct describes a singly-linked list by keeping track * of both the head and tail pointers. The list is slightly unusual in that * a parent-dir's content can be appended to the end of the local list in a * special way: the last item in the local list has its "next" pointer set @@ -89,11 +89,11 @@ static int mergelist_size = 0; * because it is shared between the current list and our parent list(s). * The easiest way to handle this is to simply truncate the list after the * tail item and then free the local list from the head. When inheriting - * the list for a new local dir, we just save off the exclude_list_struct + * the list for a new local dir, we just save off the filter_list_struct * values (so we can pop back to them later) and set the tail to NULL. */ -static void free_exclude(struct exclude_struct *ex) +static void free_filter(struct filter_struct *ex) { if (ex->match_flags & MATCHFLG_PERDIR_MERGE) { free(ex->u.mergelist->debug_type); @@ -104,26 +104,26 @@ static void free_exclude(struct exclude_struct *ex) free(ex); } -/* Build an exclude structure given an exclude pattern. The value in "pat" +/* Build a filter structure given a filter pattern. The value in "pat" * is not null-terminated. */ -static void make_exclude(struct exclude_list_struct *listp, const char *pat, - unsigned int pat_len, unsigned int mflags) +static void make_filter(struct filter_list_struct *listp, const char *pat, + unsigned int pat_len, unsigned int mflags) { - struct exclude_struct *ret; + struct filter_struct *ret; const char *cp; unsigned int ex_len; if (verbose > 2) { - rprintf(FINFO, "[%s] make_exclude(%.*s, %s%s)\n", + rprintf(FINFO, "[%s] make_filter(%.*s, %s%s)\n", who_am_i(), (int)pat_len, pat, mflags & MATCHFLG_PERDIR_MERGE ? "per-dir-merge" : mflags & MATCHFLG_INCLUDE ? "include" : "exclude", listp->debug_type); } - ret = new(struct exclude_struct); + ret = new(struct filter_struct); if (!ret) - out_of_memory("make_exclude"); + out_of_memory("make_filter"); memset(ret, 0, sizeof ret[0]); @@ -137,7 +137,7 @@ static void make_exclude(struct exclude_list_struct *listp, const char *pat, ex_len = 0; ret->pattern = new_array(char, ex_len + pat_len + 1); if (!ret->pattern) - out_of_memory("make_exclude"); + out_of_memory("make_filter"); if (ex_len) memcpy(ret->pattern, dirbuf + module_dirlen, ex_len); strlcpy(ret->pattern + ex_len, pat, pat_len + 1); @@ -159,7 +159,7 @@ static void make_exclude(struct exclude_list_struct *listp, const char *pat, } if (mflags & MATCHFLG_PERDIR_MERGE) { - struct exclude_list_struct *lp; + struct filter_list_struct *lp; unsigned int len; int i; @@ -171,7 +171,7 @@ static void make_exclude(struct exclude_list_struct *listp, const char *pat, /* If the local merge file was already mentioned, don't * add it again. */ for (i = 0; i < mergelist_cnt; i++) { - struct exclude_struct *ex = mergelist_parents[i]; + struct filter_struct *ex = mergelist_parents[i]; const char *s = strrchr(ex->pattern, '/'); if (s) s++; @@ -180,25 +180,25 @@ static void make_exclude(struct exclude_list_struct *listp, const char *pat, len = strlen(s); if (len == pat_len - (cp - ret->pattern) && memcmp(s, cp, len) == 0) { - free_exclude(ret); + free_filter(ret); return; } } - if (!(lp = new_array(struct exclude_list_struct, 1))) - out_of_memory("make_exclude"); + if (!(lp = new_array(struct filter_list_struct, 1))) + out_of_memory("make_filter"); lp->head = lp->tail = NULL; if (asprintf(&lp->debug_type, " (per-dir %s)", cp) < 0) - out_of_memory("make_exclude"); + out_of_memory("make_filter"); ret->u.mergelist = lp; if (mergelist_cnt == mergelist_size) { mergelist_size += 5; mergelist_parents = realloc_array(mergelist_parents, - struct exclude_struct *, + struct filter_struct *, mergelist_size); if (!mergelist_parents) - out_of_memory("make_exclude"); + out_of_memory("make_filter"); } mergelist_parents[mergelist_cnt++] = ret; } else { @@ -218,16 +218,16 @@ static void make_exclude(struct exclude_list_struct *listp, const char *pat, } } -static void clear_exclude_list(struct exclude_list_struct *listp) +static void clear_filter_list(struct filter_list_struct *listp) { if (listp->tail) { - struct exclude_struct *ent, *next; + struct filter_struct *ent, *next; /* Truncate any inherited items from the local list. */ listp->tail->next = NULL; /* Now free everything that is left. */ for (ent = listp->head; ent; ent = next) { next = ent->next; - free_exclude(ent); + free_filter(ent); } } @@ -299,7 +299,7 @@ static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr, } /* Sets the dirbuf and dirbuf_len values. */ -void set_excludes_dir(const char *dir, unsigned int dirlen) +void set_filter_dir(const char *dir, unsigned int dirlen) { unsigned int len; if (*dir != '/') { @@ -328,8 +328,8 @@ void set_excludes_dir(const char *dir, unsigned int dirlen) * parent directory of the first transfer dir. If it does, we scan all the * dirs from that point through the parent dir of the transfer dir looking * for the per-dir merge-file in each one. */ -static BOOL setup_merge_file(struct exclude_struct *ex, - struct exclude_list_struct *lp, int flags) +static BOOL setup_merge_file(struct filter_struct *ex, + struct filter_list_struct *lp, int flags) { char buf[MAXPATHLEN]; char *x, *y, *pat = ex->pattern; @@ -365,7 +365,7 @@ static BOOL setup_merge_file(struct exclude_struct *ex, *y = '\0'; dirbuf_len = y - dirbuf; strlcpy(x, ex->pattern, MAXPATHLEN - (x - buf)); - add_exclude_file(lp, buf, flags | XFLG_ABS_PATH); + add_filter_file(lp, buf, flags | XFLG_ABS_PATH); if (ex->match_flags & MATCHFLG_NO_INHERIT) lp->head = NULL; lp->tail = NULL; @@ -381,34 +381,34 @@ static BOOL setup_merge_file(struct exclude_struct *ex, * handle all the per-dir merge-files. The "dir" value is the current path * relative to curr_dir (which might not be null-terminated). We copy it * into dirbuf so that we can easily append a file name on the end. */ -void *push_local_excludes(const char *dir, unsigned int dirlen) +void *push_local_filters(const char *dir, unsigned int dirlen) { - struct exclude_list_struct *ap, *push; + struct filter_list_struct *ap, *push; int i; - set_excludes_dir(dir, dirlen); + set_filter_dir(dir, dirlen); if (!mergelist_cnt) return NULL; - push = new_array(struct exclude_list_struct, mergelist_cnt); + push = new_array(struct filter_list_struct, mergelist_cnt); if (!push) - out_of_memory("push_local_excludes"); + out_of_memory("push_local_filters"); for (i = 0, ap = push; i < mergelist_cnt; i++) { memcpy(ap++, mergelist_parents[i]->u.mergelist, - sizeof (struct exclude_list_struct)); + sizeof (struct filter_list_struct)); } - /* Note: add_exclude_file() might increase mergelist_cnt, so keep + /* Note: add_filter_file() might increase mergelist_cnt, so keep * this loop separate from the above loop. */ for (i = 0; i < mergelist_cnt; i++) { - struct exclude_struct *ex = mergelist_parents[i]; - struct exclude_list_struct *lp = ex->u.mergelist; + struct filter_struct *ex = mergelist_parents[i]; + struct filter_list_struct *lp = ex->u.mergelist; int flags = 0; if (verbose > 2) { - rprintf(FINFO, "[%s] pushing exclude list%s\n", + rprintf(FINFO, "[%s] pushing filter list%s\n", who_am_i(), lp->debug_type); } @@ -427,16 +427,16 @@ void *push_local_excludes(const char *dir, unsigned int dirlen) if (ex->match_flags & MATCHFLG_FINISH_SETUP) { ex->match_flags &= ~MATCHFLG_FINISH_SETUP; if (setup_merge_file(ex, lp, flags)) - set_excludes_dir(dir, dirlen); + set_filter_dir(dir, dirlen); } if (strlcpy(dirbuf + dirbuf_len, ex->pattern, MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) - add_exclude_file(lp, dirbuf, flags | XFLG_ABS_PATH); + add_filter_file(lp, dirbuf, flags | XFLG_ABS_PATH); else { io_error |= IOERR_GENERAL; rprintf(FINFO, - "cannot add local excludes in long-named directory %s\n", + "cannot add local filter rules in long-named directory: %s\n", full_fname(dirbuf)); } dirbuf[dirbuf_len] = '\0'; @@ -445,21 +445,21 @@ void *push_local_excludes(const char *dir, unsigned int dirlen) return (void*)push; } -void pop_local_excludes(void *mem) +void pop_local_filters(void *mem) { - struct exclude_list_struct *ap, *pop = (struct exclude_list_struct*)mem; + struct filter_list_struct *ap, *pop = (struct filter_list_struct*)mem; int i; for (i = mergelist_cnt; i-- > 0; ) { - struct exclude_struct *ex = mergelist_parents[i]; - struct exclude_list_struct *lp = ex->u.mergelist; + struct filter_struct *ex = mergelist_parents[i]; + struct filter_list_struct *lp = ex->u.mergelist; if (verbose > 2) { - rprintf(FINFO, "[%s] popping exclude list%s\n", + rprintf(FINFO, "[%s] popping filter list%s\n", who_am_i(), lp->debug_type); } - clear_exclude_list(lp); + clear_filter_list(lp); } if (!pop) @@ -467,14 +467,13 @@ void pop_local_excludes(void *mem) for (i = 0, ap = pop; i < mergelist_cnt; i++) { memcpy(mergelist_parents[i]->u.mergelist, ap++, - sizeof (struct exclude_list_struct)); + sizeof (struct filter_list_struct)); } free(pop); } -static int check_one_exclude(char *name, struct exclude_struct *ex, - int name_is_dir) +static int rule_matches(char *name, struct filter_struct *ex, int name_is_dir) { char *p, full_name[MAXPATHLEN]; int match_start = 0; @@ -555,12 +554,12 @@ static int check_one_exclude(char *name, struct exclude_struct *ex, } -static void report_exclude_result(char const *name, - struct exclude_struct const *ent, - int name_is_dir, const char *type) +static void report_filter_result(char const *name, + struct filter_struct const *ent, + int name_is_dir, const char *type) { /* If a trailing slash is present to match only directories, - * then it is stripped out by make_exclude. So as a special + * then it is stripped out by make_filter. So as a special * case we add it back in here. */ if (verbose >= 2) { @@ -577,20 +576,20 @@ static void report_exclude_result(char const *name, * Return -1 if file "name" is defined to be excluded by the specified * exclude list, 1 if it is included, and 0 if it was not matched. */ -int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir) +int check_filter(struct filter_list_struct *listp, char *name, int name_is_dir) { - struct exclude_struct *ent; + struct filter_struct *ent; for (ent = listp->head; ent; ent = ent->next) { if (ent->match_flags & MATCHFLG_PERDIR_MERGE) { - int rc = check_exclude(ent->u.mergelist, name, - name_is_dir); + int rc = check_filter(ent->u.mergelist, name, + name_is_dir); if (rc) return rc; continue; } - if (check_one_exclude(name, ent, name_is_dir)) { - report_exclude_result(name, ent, name_is_dir, + if (rule_matches(name, ent, name_is_dir)) { + report_filter_result(name, ent, name_is_dir, listp->debug_type); return ent->match_flags & MATCHFLG_INCLUDE ? 1 : -1; } @@ -608,8 +607,8 @@ int check_exclude(struct exclude_list_struct *listp, char *name, int name_is_dir * +/- prefixes for overriding the include/exclude mode. The *flag_ptr * value will also be set to the MATCHFLG_* bits for the current token. */ -static const char *get_exclude_tok(const char *p, int xflags, - unsigned int *len_ptr, unsigned int *flag_ptr) +static const char *get_filter_tok(const char *p, int xflags, + unsigned int *len_ptr, unsigned int *flag_ptr) { const unsigned char *s = (const unsigned char *)p; unsigned int len, mflags = 0; @@ -734,8 +733,8 @@ static const char *get_exclude_tok(const char *p, int xflags, } -void add_exclude(struct exclude_list_struct *listp, const char *pattern, - int xflags) +void add_filter(struct filter_list_struct *listp, const char *pattern, + int xflags) { unsigned int pat_len, mflags; const char *cp, *p; @@ -745,11 +744,11 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern, while (1) { /* Remember that the returned string is NOT '\0' terminated! */ - cp = get_exclude_tok(pattern, xflags, &pat_len, &mflags); + cp = get_filter_tok(pattern, xflags, &pat_len, &mflags); if (!cp) break; if (pat_len >= MAXPATHLEN) { - rprintf(FERROR, "discarding over-long exclude: %s\n", + rprintf(FERROR, "discarding over-long filter: %s\n", cp); continue; } @@ -758,10 +757,10 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern, if (mflags & MATCHFLG_CLEAR_LIST) { if (verbose > 2) { rprintf(FINFO, - "[%s] clearing exclude list%s\n", + "[%s] clearing filter list%s\n", who_am_i(), listp->debug_type); } - clear_exclude_list(listp); + clear_filter_list(listp); continue; } @@ -778,7 +777,7 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern, len -= ++name - cp; else name = cp; - make_exclude(listp, name, len, 0); + make_filter(listp, name, len, 0); mflags &= ~MATCHFLG_EXCLUDE_SELF; len = pat_len; } @@ -786,7 +785,7 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern, if (parent_dirscan) { if (!(p = parse_merge_name(cp, &len, module_dirlen))) continue; - make_exclude(listp, p, len, mflags); + make_filter(listp, p, len, mflags); continue; } } else { @@ -797,21 +796,21 @@ void add_exclude(struct exclude_list_struct *listp, const char *pattern, flgs |= XFLG_DEF_INCLUDE; else if (mflags & MATCHFLG_NO_PREFIXES) flgs |= XFLG_DEF_EXCLUDE; - add_exclude_file(listp, p, flgs); + add_filter_file(listp, p, flgs); continue; } } - make_exclude(listp, cp, pat_len, mflags); + make_filter(listp, cp, pat_len, mflags); } } -void add_exclude_file(struct exclude_list_struct *listp, const char *fname, - int xflags) +void add_filter_file(struct filter_list_struct *listp, const char *fname, + int xflags) { FILE *fp; - char line[MAXPATHLEN+MAX_EXCLUDE_PREFIX+1]; /* +1 for trailing slash. */ + char line[MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */ char *eob = line + sizeof line - 1; int word_split = xflags & XFLG_WORD_SPLIT; @@ -835,7 +834,7 @@ void add_exclude_file(struct exclude_list_struct *listp, const char *fname, dirbuf[dirbuf_len] = '\0'; if (verbose > 2) { - rprintf(FINFO, "[%s] add_exclude_file(%s,%d)\n", + rprintf(FINFO, "[%s] add_filter_file(%s,%d)\n", who_am_i(), safe_fname(fname), xflags); } @@ -858,13 +857,13 @@ void add_exclude_file(struct exclude_list_struct *listp, const char *fname, overflow = 1; } if (overflow) { - rprintf(FERROR, "discarding over-long exclude: %s...\n", line); + rprintf(FERROR, "discarding over-long filter: %s...\n", line); s = line; } *s = '\0'; /* Skip an empty token and (when line parsing) comments. */ if (*line && (word_split || (*line != ';' && *line != '#'))) - add_exclude(listp, line, xflags); + add_filter(listp, line, xflags); if (ch == EOF) break; } @@ -872,18 +871,18 @@ void add_exclude_file(struct exclude_list_struct *listp, const char *fname, } -void send_exclude_list(int f) +void send_filter_list(int f) { - struct exclude_struct *ent; + struct filter_struct *ent; /* This is a complete hack - blame Rusty. FIXME! * Remove this hack when older rsyncs (below 2.6.4) are gone. */ if (list_only == 1 && !recurse) - add_exclude(&exclude_list, "/*/*", XFLG_DEF_EXCLUDE); + add_filter(&filter_list, "/*/*", XFLG_DEF_EXCLUDE); - for (ent = exclude_list.head; ent; ent = ent->next) { + for (ent = filter_list.head; ent; ent = ent->next) { unsigned int l; - char p[MAXPATHLEN+MAX_EXCLUDE_PREFIX+1]; + char p[MAXPATHLEN+MAX_RULE_PREFIX+1]; l = strlcpy(p, ent->pattern, sizeof p); if (l == 0 || l >= MAXPATHLEN) @@ -894,7 +893,7 @@ void send_exclude_list(int f) } if (ent->match_flags & MATCHFLG_PERDIR_MERGE) { - char buf[MAX_EXCLUDE_PREFIX], *op = buf; + char buf[MAX_RULE_PREFIX], *op = buf; if (protocol_version < 29) { rprintf(FERROR, "remote rsync is too old to understand per-directory merge files.\n"); @@ -914,8 +913,8 @@ void send_exclude_list(int f) *op++ = '-'; } *op++ = ' '; - if (op - buf > MAX_EXCLUDE_PREFIX) - overflow("send_exclude_list"); + if (op - buf > MAX_RULE_PREFIX) + overflow("send_filter_list"); write_int(f, l + (op - buf)); write_buf(f, buf, op - buf); } else if (ent->match_flags & MATCHFLG_INCLUDE) { @@ -934,17 +933,17 @@ void send_exclude_list(int f) } -void recv_exclude_list(int f) +void recv_filter_list(int f) { - char line[MAXPATHLEN+MAX_EXCLUDE_PREFIX+1]; /* +1 for trailing slash. */ + char line[MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */ unsigned int xflags = protocol_version >= 29 ? 0 : XFLG_DEF_EXCLUDE; unsigned int l; while ((l = read_int(f)) != 0) { if (l >= sizeof line) - overflow("recv_exclude_list"); + overflow("recv_filter_list"); read_sbuf(f, line, l); - add_exclude(&exclude_list, line, xflags); + add_filter(&filter_list, line, xflags); } } @@ -966,13 +965,13 @@ void add_cvs_excludes(void) char fname[MAXPATHLEN]; char *p; - add_exclude(&exclude_list, ":C", 0); - add_exclude(&exclude_list, default_cvsignore, cvs_flags); + add_filter(&filter_list, ":C", 0); + add_filter(&filter_list, default_cvsignore, cvs_flags); if ((p = getenv("HOME")) && pathjoin(fname, sizeof fname, p, ".cvsignore") < sizeof fname) { - add_exclude_file(&exclude_list, fname, cvs_flags); + add_filter_file(&filter_list, fname, cvs_flags); } - add_exclude(&exclude_list, getenv("CVSIGNORE"), cvs_flags); + add_filter(&filter_list, getenv("CVSIGNORE"), cvs_flags); } diff --git a/flist.c b/flist.c index c607d733..ac57167f 100644 --- a/flist.c +++ b/flist.c @@ -70,8 +70,8 @@ extern int max_delete; extern int orig_umask; extern int list_only; -extern struct exclude_list_struct exclude_list; -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct filter_list; +extern struct filter_list_struct server_filter_list; int io_error; @@ -220,15 +220,13 @@ int link_stat(const char *path, STRUCT_STAT *buffer, int follow_dirlinks) #endif } -/* - * This function is used to check if a file should be included/excluded +/* This function is used to check if a file should be included/excluded * from the list of files based on its name and type etc. The value of - * exclude_level is set to either SERVER_EXCLUDES or ALL_EXCLUDES. - */ -static int check_exclude_file(char *fname, int is_dir, int exclude_level) + * filter_level is set to either SERVER_FILTERS or ALL_FILTERS. */ +static int is_excluded(char *fname, int is_dir, int filter_level) { #if 0 /* This currently never happens, so avoid a useless compare. */ - if (exclude_level == NO_EXCLUDES) + if (filter_level == NO_FILTERS) return 0; #endif if (fname) { @@ -242,13 +240,13 @@ static int check_exclude_file(char *fname, int is_dir, int exclude_level) return 0; } } - if (server_exclude_list.head - && check_exclude(&server_exclude_list, fname, is_dir) < 0) + if (server_filter_list.head + && check_filter(&server_filter_list, fname, is_dir) < 0) return 1; - if (exclude_level != ALL_EXCLUDES) + if (filter_level != ALL_FILTERS) return 0; - if (exclude_list.head - && check_exclude(&exclude_list, fname, is_dir) < 0) + if (filter_list.head + && check_filter(&filter_list, fname, is_dir) < 0) return 1; return 0; } @@ -758,7 +756,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags, * important case. Some systems may not have d_type. **/ struct file_struct *make_file(char *fname, struct file_list *flist, - int exclude_level) + int filter_level) { static char *lastdir; static int lastdir_len = -1; @@ -788,8 +786,8 @@ struct file_struct *make_file(char *fname, struct file_list *flist, if (readlink_stat(thisname, &st, linkname) != 0) { int save_errno = errno; /* See if file is excluded before reporting an error. */ - if (exclude_level != NO_EXCLUDES - && check_exclude_file(thisname, 0, exclude_level)) + if (filter_level != NO_FILTERS + && is_excluded(thisname, 0, filter_level)) return NULL; if (save_errno == ENOENT) { #if SUPPORT_LINKS @@ -816,9 +814,9 @@ struct file_struct *make_file(char *fname, struct file_list *flist, return NULL; } - /* backup.c calls us with exclude_level set to NO_EXCLUDES. */ - if (exclude_level == NO_EXCLUDES) - goto skip_excludes; + /* backup.c calls us with filter_level set to NO_FILTERS. */ + if (filter_level == NO_FILTERS) + goto skip_filters; if (S_ISDIR(st.st_mode) && !xfer_dirs) { rprintf(FINFO, "skipping directory %s\n", thisname); @@ -832,7 +830,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist, && S_ISDIR(st.st_mode)) flags |= FLAG_MOUNT_POINT; - if (check_exclude_file(thisname, S_ISDIR(st.st_mode) != 0, exclude_level)) + if (is_excluded(thisname, S_ISDIR(st.st_mode) != 0, filter_level)) return NULL; if (lp_ignore_nonreadable(module_id)) { @@ -843,11 +841,11 @@ struct file_struct *make_file(char *fname, struct file_list *flist, return NULL; } -skip_excludes: +skip_filters: if (verbose > 2) { rprintf(FINFO, "[%s] make_file(%s,*,%d)\n", - who_am_i(), thisname, exclude_level); + who_am_i(), thisname, filter_level); } if ((basename = strrchr(thisname, '/')) != NULL) { @@ -983,7 +981,7 @@ void send_file_name(int f, struct file_list *flist, char *fname, /* f is set to -1 when calculating deletion file list */ file = make_file(fname, flist, - f == -1 && delete_excluded? SERVER_EXCLUDES : ALL_EXCLUDES); + f == -1 && delete_excluded? SERVER_FILTERS : ALL_FILTERS); if (!file) return; @@ -1012,7 +1010,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) struct dirent *di; char fname[MAXPATHLEN]; unsigned int offset; - void *save_excludes; + void *save_filters; char *p; d = opendir(dir); @@ -1036,7 +1034,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) offset++; } - save_excludes = push_local_excludes(fname, offset); + save_filters = push_local_filters(fname, offset); for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { char *dname = d_name(di); @@ -1058,7 +1056,7 @@ static void send_directory(int f, struct file_list *flist, char *dir) rsyserr(FERROR, errno, "readdir(%s)", dir); } - pop_local_excludes(save_excludes); + pop_local_filters(save_filters); closedir(d); } @@ -1101,7 +1099,7 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) } use_ff_fd = 1; if (curr_dir_len < MAXPATHLEN - 1) { - push_local_excludes(curr_dir, curr_dir_len); + push_local_filters(curr_dir, curr_dir_len); need_first_push = False; } } @@ -1145,9 +1143,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[]) if (need_first_push) { if ((p = strrchr(fname, '/')) != NULL) { if (*++p && strcmp(p, ".") != 0) - push_local_excludes(fname, p - fname); + push_local_filters(fname, p - fname); } else if (strcmp(fname, ".") != 0) - push_local_excludes(fname, 0); + push_local_filters(fname, 0); need_first_push = False; } diff --git a/generator.c b/generator.c index bf507913..88e369e6 100644 --- a/generator.c +++ b/generator.c @@ -61,7 +61,7 @@ extern int orig_umask; extern int safe_symlinks; extern long block_size; /* "long" because popt can't set an int32. */ -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct server_filter_list; static int unchanged_attrs(struct file_struct *file, STRUCT_STAT *st) { @@ -254,9 +254,9 @@ static void recv_generator(char *fname, struct file_list *flist, if (verbose > 2) rprintf(FINFO, "recv_generator(%s,%d)\n", safe_fname(fname), i); - if (server_exclude_list.head - && check_exclude(&server_exclude_list, fname, - S_ISDIR(file->mode)) < 0) { + if (server_filter_list.head + && check_filter(&server_filter_list, fname, + S_ISDIR(file->mode)) < 0) { if (verbose) { rprintf(FINFO, "skipping server-excluded file \"%s\"\n", safe_fname(fname)); @@ -547,7 +547,7 @@ prepare_to_open: close(fd); return; } - if (!(back_file = make_file(fname, NULL, NO_EXCLUDES))) { + if (!(back_file = make_file(fname, NULL, NO_FILTERS))) { close(fd); goto pretend_missing; } diff --git a/main.c b/main.c index c9eb5a25..b45a9806 100644 --- a/main.c +++ b/main.c @@ -596,7 +596,7 @@ static void do_server_recv(int f_in, int f_out, int argc,char *argv[]) io_start_buffering_in(); if (delete_mode && !delete_excluded) - recv_exclude_list(f_in); + recv_filter_list(f_in); if (filesfrom_fd >= 0) { /* We need to send the files-from names to the sender at the @@ -650,7 +650,7 @@ void start_server(int f_in, int f_out, int argc, char *argv[]) if (am_sender) { keep_dirlinks = 0; /* Must be disabled on the sender. */ - recv_exclude_list(f_in); + recv_filter_list(f_in); if (cvs_exclude) add_cvs_excludes(); do_server_sender(f_in, f_out, argc, argv); @@ -701,7 +701,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) if (cvs_exclude) add_cvs_excludes(); if (delete_mode && !delete_excluded) - send_exclude_list(f_out); + send_filter_list(f_out); if (remote_filesfrom_file) filesfrom_fd = f_in; @@ -735,7 +735,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[]) list_only |= 1; if (!read_batch) - send_exclude_list(f_out); + send_filter_list(f_out); if (cvs_exclude) add_cvs_excludes(); diff --git a/options.c b/options.c index ce0788d3..3082e5c0 100644 --- a/options.c +++ b/options.c @@ -23,8 +23,8 @@ extern int sanitize_paths; extern int select_timeout; -extern struct exclude_list_struct exclude_list; -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct filter_list; +extern struct filter_list_struct server_filter_list; int make_backups = 0; @@ -643,17 +643,17 @@ int parse_arguments(int *argc, const char ***argv, int frommain) break; case OPT_FILTER: - add_exclude(&exclude_list, poptGetOptArg(pc), 0); + add_filter(&filter_list, poptGetOptArg(pc), 0); break; case OPT_EXCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), - XFLG_DEF_EXCLUDE); + add_filter(&filter_list, poptGetOptArg(pc), + XFLG_DEF_EXCLUDE); break; case OPT_INCLUDE: - add_exclude(&exclude_list, poptGetOptArg(pc), - XFLG_DEF_INCLUDE); + add_filter(&filter_list, poptGetOptArg(pc), + XFLG_DEF_INCLUDE); break; case OPT_EXCLUDE_FROM: @@ -661,13 +661,13 @@ int parse_arguments(int *argc, const char ***argv, int frommain) arg = poptGetOptArg(pc); if (sanitize_paths) arg = sanitize_path(NULL, arg, NULL, 0); - if (server_exclude_list.head) { + if (server_filter_list.head) { char *cp = (char *)arg; clean_fname(cp, 1); - if (check_exclude(&server_exclude_list, cp, 0) < 0) + if (check_filter(&server_filter_list, cp, 0) < 0) goto options_rejected; } - add_exclude_file(&exclude_list, arg, XFLG_FATAL_ERRORS + add_filter_file(&filter_list, arg, XFLG_FATAL_ERRORS | (opt == OPT_INCLUDE_FROM ? XFLG_DEF_INCLUDE : XFLG_DEF_EXCLUDE)); break; @@ -696,11 +696,11 @@ int parse_arguments(int *argc, const char ***argv, int frommain) case 'F': switch (++F_option_cnt) { case 1: - add_exclude(&exclude_list, + add_filter(&filter_list, ": /.rsync-filter", 0); break; case 2: - add_exclude(&exclude_list, + add_filter(&filter_list, "- .rsync-filter", 0); break; } @@ -921,33 +921,33 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (files_from) files_from = sanitize_path(NULL, files_from, NULL, 0); } - if (server_exclude_list.head && !am_sender) { - struct exclude_list_struct *elp = &server_exclude_list; + if (server_filter_list.head && !am_sender) { + struct filter_list_struct *elp = &server_filter_list; int i; if (tmpdir) { clean_fname(tmpdir, 1); - if (check_exclude(elp, tmpdir, 1) < 0) + if (check_filter(elp, tmpdir, 1) < 0) goto options_rejected; } if (partial_dir) { clean_fname(partial_dir, 1); - if (check_exclude(elp, partial_dir, 1) < 0) + if (check_filter(elp, partial_dir, 1) < 0) goto options_rejected; } for (i = 0; i < basis_dir_cnt; i++) { clean_fname(basis_dir[i], 1); - if (check_exclude(elp, basis_dir[i], 1) < 0) + if (check_filter(elp, basis_dir[i], 1) < 0) goto options_rejected; } if (backup_dir) { clean_fname(backup_dir, 1); - if (check_exclude(elp, backup_dir, 1) < 0) + if (check_filter(elp, backup_dir, 1) < 0) goto options_rejected; } } - if (server_exclude_list.head && files_from) { + if (server_filter_list.head && files_from) { clean_fname(files_from, 1); - if (check_exclude(&server_exclude_list, files_from, 0) < 0) { + if (check_filter(&server_filter_list, files_from, 0) < 0) { options_rejected: snprintf(err_buf, sizeof err_buf, "Your options have been rejected by the server.\n"); @@ -1016,7 +1016,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain) if (!*partial_dir || strcmp(partial_dir, ".") == 0) partial_dir = NULL; else if (*partial_dir != '/') { - add_exclude(&exclude_list, partial_dir, + add_filter(&filter_list, partial_dir, XFLG_DIRECTORY | XFLG_DEF_EXCLUDE); } keep_partial = 1; diff --git a/receiver.c b/receiver.c index 80e645a0..01f79252 100644 --- a/receiver.c +++ b/receiver.c @@ -49,7 +49,7 @@ extern int keep_partial; extern int checksum_seed; extern int inplace; -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct server_filter_list; /* This deletes any files on the receiving side that are not present on the @@ -360,8 +360,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name, next_gen_i = -1; } - if (server_exclude_list.head - && check_exclude(&server_exclude_list, fname, + if (server_filter_list.head + && check_filter(&server_filter_list, fname, S_ISDIR(file->mode)) < 0) { rprintf(FERROR, "attempt to hack rsync failed.\n"); exit_cleanup(RERR_PROTOCOL); diff --git a/rsync.h b/rsync.h index b6fea0f0..0c04679e 100644 --- a/rsync.h +++ b/rsync.h @@ -103,9 +103,9 @@ #define MPLEX_BASE 7 -#define NO_EXCLUDES 0 -#define SERVER_EXCLUDES 1 -#define ALL_EXCLUDES 2 +#define NO_FILTERS 0 +#define SERVER_FILTERS 1 +#define ALL_FILTERS 2 #define XFLG_FATAL_ERRORS (1<<0) #define XFLG_DEF_INCLUDE (1<<1) @@ -516,19 +516,19 @@ struct map_struct { #define MATCHFLG_PERDIR_MERGE (1<<11)/* merge-file is searched per-dir */ #define MATCHFLG_EXCLUDE_SELF (1<<12)/* merge-file name should be excluded */ #define MATCHFLG_FINISH_SETUP (1<<13)/* per-dir merge file needs setup */ -struct exclude_struct { - struct exclude_struct *next; +struct filter_struct { + struct filter_struct *next; char *pattern; unsigned int match_flags; union { int slash_cnt; - struct exclude_list_struct *mergelist; + struct filter_list_struct *mergelist; } u; }; -struct exclude_list_struct { - struct exclude_struct *head; - struct exclude_struct *tail; +struct filter_list_struct { + struct filter_struct *head; + struct filter_struct *tail; char *debug_type; }; diff --git a/t_stub.c b/t_stub.c index c72eb07f..055bd7ef 100644 --- a/t_stub.c +++ b/t_stub.c @@ -29,7 +29,7 @@ int modify_window = 0; int module_id = -1; char *partial_dir; -struct exclude_list_struct server_exclude_list; +struct filter_list_struct server_filter_list; void rprintf(UNUSED(enum logcode code), const char *format, ...) { @@ -56,7 +56,7 @@ struct exclude_list_struct server_exclude_list; exit(code); } - int check_exclude(UNUSED(struct exclude_list_struct *listp), UNUSED(char *name), + int check_filter(UNUSED(struct filter_list_struct *listp), UNUSED(char *name), UNUSED(int name_is_dir)) { /* This function doesn't really get called in this test context, so diff --git a/util.c b/util.c index 1e1c9db8..8260897d 100644 --- a/util.c +++ b/util.c @@ -32,7 +32,7 @@ extern int dry_run; extern int module_id; extern int modify_window; extern char *partial_dir; -extern struct exclude_list_struct server_exclude_list; +extern struct filter_list_struct server_filter_list; int sanitize_paths = 0; @@ -479,14 +479,14 @@ int lock_range(int fd, int offset, int len) return fcntl(fd,F_SETLK,&lock) == 0; } -static int exclude_server_path(char *arg) +static int filter_server_path(char *arg) { char *s; - if (server_exclude_list.head) { + if (server_filter_list.head) { for (s = arg; (s = strchr(s, '/')) != NULL; ) { *s = '\0'; - if (check_exclude(&server_exclude_list, arg, 1) < 0) { + if (check_filter(&server_filter_list, arg, 1) < 0) { /* We must leave arg truncated! */ return 1; } @@ -513,7 +513,7 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr, if (!*s) s = "."; s = argv[argc++] = strdup(s); - exclude_server_path(s); + filter_server_path(s); #else glob_t globbuf; int i; @@ -529,7 +529,7 @@ static void glob_expand_one(char *s, char ***argv_ptr, int *argc_ptr, s = strdup(s); memset(&globbuf, 0, sizeof globbuf); - if (!exclude_server_path(s)) + if (!filter_server_path(s)) glob(s, 0, NULL, &globbuf); if (MAX((int)globbuf.gl_pathc, 1) > maxargs - argc) { maxargs += globbuf.gl_pathc + MAX_ARGS; @@ -966,8 +966,8 @@ char *partial_dir_fname(const char *fname) fn = fname; if ((int)pathjoin(t, sz, partial_dir, fn) >= sz) return NULL; - if (server_exclude_list.head - && check_exclude(&server_exclude_list, partial_fname, 0) < 0) + if (server_filter_list.head + && check_filter(&server_filter_list, partial_fname, 0) < 0) return NULL; return partial_fname; -- 2.34.1