1 After applying this patch and running configure, you MUST run this
6 This patch adds the ability to merge rules into your excludes/includes
7 using a ". FILE" idiom. If you specify a name with a preceding -p
8 option, that filename will be looked for in every subdirectory that
9 rsync visits, and the rules found in that subdirectory's file will
10 affect either just that dir or, if -i is specified, that dir and its
15 rsync -av --exclude='. -pi .excl' from/ to
17 The above will look for a file named ".excl" in every directory of the
18 hierarchy that rsync visits, and it will exclude (by default) names
19 based on the rules found therein. If one of the .excl files contains
27 Then the file ".excl2" will also be read in from the current dir and all
28 its subdirs (due to the -p option) with each file's rules only affecting
29 the file's current directory. The file ".excl3" would just be read in
30 for the current dir (because it was not specified with the -p option),
31 but its rules would be inherited by all its subdirectories (because of
36 --- orig/exclude.c 2004-08-05 23:16:37
37 +++ exclude.c 2004-08-06 23:22:00
42 +extern int am_sender;
47 +extern int module_id;
48 +extern int delete_mode;
49 +extern int delete_excluded;
50 +extern int sanitize_paths;
52 extern char curr_dir[];
53 +extern unsigned int curr_dir_len;
55 struct exclude_list_struct exclude_list = { 0, 0, "" };
56 -struct exclude_list_struct local_exclude_list = { 0, 0, "per-dir .cvsignore " };
57 struct exclude_list_struct server_exclude_list = { 0, 0, "server " };
58 char *exclude_path_prefix = NULL;
60 +struct mergelist_save_struct {
61 + struct exclude_list_struct *array;
65 +static char dirbuf[MAXPATHLEN];
66 +static unsigned int dirbuf_offset = 0;
67 +static struct exclude_struct **mergelist_parents;
68 +static int mergelist_cnt = 0;
69 +static int mergelist_size = 0;
70 +static int initialized_mergelist_cnt = -1;
72 +/* Each exclude_list_struct describes a singly-linked list by keeping track
73 + * of both the head and tail pointers. The list is slightly unusual in that
74 + * a parent-dir's content can be appended to the end of the local list in a
75 + * special way: the last item in the local list has its "next" pointer set
76 + * to point to the inherited list, but the local list's tail pointer points
77 + * at the end of the local list. Thus, if the local list is empty, the head
78 + * will be pointing at the inherited content but the tail will be NULL. To
79 + * help you visualize this, here are the possible list arrangements:
81 + * Completely Empty Local Content Only
82 + * ================================== ====================================
83 + * head -> NULL head -> Local1 -> Local2 -> NULL
84 + * tail -> NULL tail -------------^
86 + * Inherited Content Only Both Local and Inherited Content
87 + * ================================== ====================================
88 + * head -> Parent1 -> Parent2 -> NULL head -> L1 -> L2 -> P1 -> P2 -> NULL
89 + * tail -> NULL tail ---------^
91 + * This means that anyone wanting to traverse the whole list to USE it just
92 + * needs to start at the head and use the "next" pointers until it goes
93 + * NULL. To add new local content, we insert the item after the tail item
94 + * and update the tail (obviously, if "tail" was NULL, we insert it at the
95 + * head). To clear the local list, WE MUST NOT FREE THE INHERITED CONTENT
96 + * because it is shared between the current list and our parent list(s).
97 + * The easiest way to handle this is to simply truncate the list after the
98 + * tail item and then free the local list from the head. When inheriting
99 + * the list for a new local dir, we just save off the exclude_list_struct
100 + * values (so we can pop back to them later) and set the tail to NULL.
103 /** Build an exclude structure given an exclude pattern. */
104 static void make_exclude(struct exclude_list_struct *listp, const char *pat,
105 unsigned int pat_len, unsigned int mflags)
106 @@ -46,6 +95,31 @@ static void make_exclude(struct exclude_
111 + rprintf(FINFO, "[%s] add_exclude(%.*s, %s%s%sclude)\n",
112 + who_am_i(), (int)pat_len, pat, listp->debug_type,
113 + mflags & MATCHFLG_MERGE_FILE ? "FILE " : "",
114 + mflags & MATCHFLG_INCLUDE ? "in" : "ex");
117 + if (mflags & MATCHFLG_MERGE_FILE) {
119 + /* If the local include file was already mentioned, don't
121 + for (i = 0; i < mergelist_cnt; i++) {
122 + struct exclude_struct *ex = mergelist_parents[i];
123 + if (strlen(ex->pattern) == pat_len
124 + && memcmp(ex->pattern, pat, pat_len) == 0)
127 + if ((pat_len == 10 || (pat_len > 10 && pat[pat_len-11] == '/'))
128 + && strncmp(pat+pat_len-10, ".cvsignore", 10) == 0) {
129 + mflags |= MATCHFLG_CVSIGNORE;
130 + mflags &= ~(MATCHFLG_INCLUDE | MATCHFLG_INHERIT);
132 + mflags &= ~MATCHFLG_CVSIGNORE;
135 ret = new(struct exclude_struct);
137 out_of_memory("make_exclude");
138 @@ -81,14 +155,40 @@ static void make_exclude(struct exclude_
139 mflags |= MATCHFLG_DIRECTORY;
142 - for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
144 + if (mflags & MATCHFLG_MERGE_FILE) {
145 + struct exclude_list_struct *lp
146 + = new_array(struct exclude_list_struct, 1);
148 + out_of_memory("make_exclude");
149 + lp->head = lp->tail = NULL;
150 + if ((cp = strrchr(ret->pattern, '/')) != NULL)
154 + if (asprintf(&lp->debug_type, "per-dir %s ", cp) < 0)
155 + out_of_memory("make_exclude");
156 + ret->u.mergelist = lp;
157 + if (mergelist_cnt == mergelist_size) {
158 + mergelist_size += 5;
159 + mergelist_parents = realloc_array(mergelist_parents,
160 + struct exclude_struct *,
162 + if (!mergelist_parents)
163 + out_of_memory("make_exclude");
165 + mergelist_parents[mergelist_cnt++] = ret;
167 + for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
168 + ret->u.slash_cnt++;
171 ret->match_flags = mflags;
174 + if (!listp->tail) {
175 + ret->next = listp->head;
176 listp->head = listp->tail = ret;
179 + ret->next = listp->tail->next;
180 listp->tail->next = ret;
183 @@ -96,22 +196,247 @@ static void make_exclude(struct exclude_
185 static void free_exclude(struct exclude_struct *ex)
187 + if (ex->match_flags & MATCHFLG_MERGE_FILE) {
188 + free(ex->u.mergelist->debug_type);
189 + free(ex->u.mergelist);
195 -void clear_exclude_list(struct exclude_list_struct *listp)
196 +static void clear_exclude_list(struct exclude_list_struct *listp)
198 - struct exclude_struct *ent, *next;
200 - for (ent = listp->head; ent; ent = next) {
204 + struct exclude_struct *ent, *next;
205 + /* Truncate any inherited items from the local list. */
206 + listp->tail->next = NULL;
207 + /* Now free everything that is left. */
208 + for (ent = listp->head; ent; ent = next) {
214 listp->head = listp->tail = NULL;
217 +/* This returns a fully expanded filename for the merge-file name if the
218 + * name has any slashes in it, otherwise it returns the original name. */
219 +static char *parse_merge_name(const char *merge_file, unsigned int *len_ptr)
221 + static char buf[MAXPATHLEN];
222 + char *fn, tmpbuf[MAXPATHLEN];
223 + unsigned int fn_len, cd_len;
225 + cd_len = dirbuf_offset && *dirbuf == '/' ? 0 : curr_dir_len + 1;
226 + if (cd_len && *merge_file != '/') {
229 + for (p = merge_file + *len_ptr;
230 + --p > merge_file && *p != '/'; ) {}
232 + p = strchr(merge_file, '/');
233 + if (!p || p == merge_file)
234 + return (char *)merge_file;
237 + fn = *merge_file == '/' ? buf : tmpbuf;
238 + if (sanitize_paths) {
239 + /* null-terminate the name if it isn't already */
240 + if (len_ptr && merge_file[*len_ptr]) {
241 + char *to = fn == buf ? tmpbuf : buf;
242 + strlcpy(to, merge_file, *len_ptr + 1);
245 + dirbuf[dirbuf_offset] = '\0';
246 + if (!sanitize_path(fn, merge_file, dirbuf)) {
247 + rprintf(FERROR, "merge filename overflows: %s\n",
252 + strlcpy(fn, merge_file, len_ptr ? *len_ptr + 1 : MAXPATHLEN);
259 + fn_len = strlen(fn);
260 + if (cd_len + dirbuf_offset + fn_len >= MAXPATHLEN) {
261 + rprintf(FERROR, "merge filename overflows: %s\n", fn);
265 + memcpy(buf, curr_dir, curr_dir_len);
266 + buf[curr_dir_len] = '/';
269 + memcpy(buf + cd_len, dirbuf, dirbuf_offset);
270 + memcpy(buf + cd_len + dirbuf_offset, fn, fn_len + 1);
271 + fn_len = clean_fname(buf);
278 +static void prep_merge_file(struct exclude_struct *ex,
279 + struct exclude_list_struct *lp, int flags,
280 + char *dir, unsigned int dirlen)
282 + char buf[MAXPATHLEN];
283 + char *x, *y, *fn = ex->pattern;
285 + if (!(fn = parse_merge_name(fn, NULL)) || *fn != '/')
288 + x = strrchr(fn, '/');
290 + if (dir[dirlen]) /* avoid writing to a read-only string */
291 + dir[dirlen] = '\0';
292 + pathjoin(dirbuf, MAXPATHLEN, sanitize_paths ? "" : curr_dir, dir);
293 + if (dirlen == 2 && *dir == '.') {
294 + int len = strlen(dirbuf);
295 + dirbuf[len-2] = '\0';
300 + strlcpy(buf, fn, MAXPATHLEN);
302 + pathjoin(buf, MAXPATHLEN, dirbuf, fn);
306 + if (!*buf || buf[1])
307 + strlcat(buf, "/", MAXPATHLEN);
309 + if (sanitize_paths)
310 + x += strlen(lp_path(module_id));
311 + for (y = dirbuf; *x && *x == *y; x++, y++) {}
316 + char save[MAXPATHLEN];
317 + strlcpy(save, y, MAXPATHLEN);
318 + dirbuf_offset = y - dirbuf;
319 + strlcpy(x, fn, MAXPATHLEN - (x - buf));
321 + add_exclude_file(lp, buf, flags);
322 + strlcpy(y, save, MAXPATHLEN);
323 + while ((*x++ = *y++) != '/') {}
326 + if (dirlen == 2 && *dir == '.') /* dir[dirlen-1] is always '/' */
329 + dirbuf_offset = dirlen;
330 + memcpy(dirbuf, dir, dirbuf_offset);
333 + ex->pattern = strdup(fn);
337 +void *push_local_excludes(char *dir, unsigned int dirlen)
339 + struct mergelist_save_struct *push;
340 + struct exclude_list_struct *ap;
343 + /* Make it easy to construct the full path for a merge-file that was
344 + * specified with a relative path by saving off the current dir. */
345 + if (dirlen == 2 && *dir == '.') /* dir[dirlen-1] is always '/' */
348 + dirbuf_offset = dirlen;
349 + memcpy(dirbuf, dir, dirbuf_offset);
352 + if (!(push = new_array(struct mergelist_save_struct, 1)))
353 + out_of_memory("push_local_excludes");
355 + push->count = mergelist_cnt;
356 + push->array = new_array(struct exclude_list_struct, mergelist_cnt);
358 + out_of_memory("push_local_excludes");
360 + for (i = 0, ap = push->array; i < mergelist_cnt; i++) {
361 + memcpy(ap++, mergelist_parents[i]->u.mergelist,
362 + sizeof (struct exclude_list_struct));
365 + /* Note: add_exclude_file() might increase mergelist_cnt, so keep
366 + * this loop separate from the above loop. */
367 + for (i = 0; i < mergelist_cnt; i++) {
368 + struct exclude_struct *ex = mergelist_parents[i];
369 + struct exclude_list_struct *lp = ex->u.mergelist;
373 + rprintf(FINFO, "[%s] pushing %sexclude list\n",
374 + who_am_i(), lp->debug_type);
377 + if (ex->match_flags & MATCHFLG_CVSIGNORE)
378 + flags = XFLG_WORD_SPLIT | XFLG_WORDS_ONLY;
380 + flags = ex->match_flags & MATCHFLG_INCLUDE
381 + ? XFLG_DEF_INCLUDE : 0;
384 + if (initialized_mergelist_cnt < i) {
385 + prep_merge_file(ex, lp, flags, dir, dirlen);
386 + initialized_mergelist_cnt = i;
389 + if (!(ex->match_flags & MATCHFLG_INHERIT))
392 + if (strlcpy(dirbuf + dirbuf_offset, ex->pattern,
393 + MAXPATHLEN - dirbuf_offset) < MAXPATHLEN - dirbuf_offset)
394 + add_exclude_file(lp, dirbuf, flags);
396 + io_error |= IOERR_GENERAL;
398 + "cannot add local excludes in long-named directory %s\n",
399 + full_fname(dirbuf));
403 + return (void*)push;
406 +void pop_local_excludes(void *mem)
408 + struct mergelist_save_struct *pop = (struct mergelist_save_struct*)mem;
409 + struct exclude_list_struct *ap;
412 + for (i = mergelist_cnt; i-- > 0; ) {
413 + struct exclude_struct *ex = mergelist_parents[i];
414 + struct exclude_list_struct *lp = ex->u.mergelist;
417 + rprintf(FINFO, "[%s] popping %sexclude list\n",
418 + who_am_i(), lp->debug_type);
421 + clear_exclude_list(lp);
424 + mergelist_cnt = initialized_mergelist_cnt = pop->count;
425 + for (i = 0, ap = pop->array; i < mergelist_cnt; i++) {
426 + memcpy(mergelist_parents[i]->u.mergelist, ap++,
427 + sizeof (struct exclude_list_struct));
434 static int check_one_exclude(char *name, struct exclude_struct *ex,
437 @@ -122,7 +447,7 @@ static int check_one_exclude(char *name,
438 /* If the pattern does not have any slashes AND it does not have
439 * a "**" (which could match a slash), then we just match the
440 * name portion of the path. */
441 - if (!ex->slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) {
442 + if (!ex->u.slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) {
443 if ((p = strrchr(name,'/')) != NULL)
446 @@ -133,7 +458,8 @@ static int check_one_exclude(char *name,
450 - if (!name[0]) return 0;
454 if (ex->match_flags & MATCHFLG_DIRECTORY && !name_is_dir)
456 @@ -148,9 +474,9 @@ static int check_one_exclude(char *name,
457 if (ex->match_flags & MATCHFLG_WILD) {
458 /* A non-anchored match with an infix slash and no "**"
459 * needs to match the last slash_cnt+1 name elements. */
460 - if (!match_start && ex->slash_cnt
461 + if (!match_start && ex->u.slash_cnt
462 && !(ex->match_flags & MATCHFLG_WILD2)) {
463 - int cnt = ex->slash_cnt + 1;
464 + int cnt = ex->u.slash_cnt + 1;
465 for (p = name + strlen(name) - 1; p >= name; p--) {
466 if (*p == '/' && !--cnt)
468 @@ -221,6 +547,13 @@ int check_exclude(struct exclude_list_st
469 struct exclude_struct *ent;
471 for (ent = listp->head; ent; ent = ent->next) {
472 + if (ent->match_flags & MATCHFLG_MERGE_FILE) {
473 + int rc = check_exclude(ent->u.mergelist, name,
479 if (check_one_exclude(name, ent, name_is_dir)) {
480 report_exclude_result(name, ent, name_is_dir,
482 @@ -253,12 +586,41 @@ static const char *get_exclude_tok(const
486 - /* Is this a '+' or '-' followed by a space (not whitespace)? */
487 + /* Check for a +/-/. followed by a space (not whitespace). */
488 if (!(xflags & XFLG_WORDS_ONLY)
489 - && (*s == '-' || *s == '+') && s[1] == ' ') {
490 + && (*s == '-' || *s == '+' || *s == '.') && s[1] == ' ') {
492 mflags |= MATCHFLG_INCLUDE;
493 + else if (*s == '.') {
494 + mflags |= MATCHFLG_MERGE_FILE;
495 + if (xflags & XFLG_DEF_INCLUDE)
496 + mflags |= MATCHFLG_INCLUDE;
497 + while (s[2] == '-') {
502 + mflags |= MATCHFLG_INHERIT;
505 + mflags |= MATCHFLG_PERDIR_MERGE;
512 + "invalid merge options: %s\n",
514 + exit_cleanup(RERR_SYNTAX);
516 + } while (s[1] != ' ');
521 + if (mflags & MATCHFLG_MERGE_FILE && *s == '.' && s[1] == '/')
523 } else if (xflags & XFLG_DEF_INCLUDE)
524 mflags |= MATCHFLG_INCLUDE;
526 @@ -292,9 +654,15 @@ void add_exclude(struct exclude_list_str
530 + /* Remember that the returned string is NOT '\0' terminated! */
531 cp = get_exclude_tok(cp + pat_len, &pat_len, &mflags, xflags);
534 + if (pat_len >= MAXPATHLEN) {
535 + rprintf(FERROR, "discarding over-long exclude: %s\n",
540 if (mflags & MATCHFLG_CLEAR_LIST) {
542 @@ -306,13 +674,23 @@ void add_exclude(struct exclude_list_str
546 - make_exclude(listp, cp, pat_len, mflags);
549 - rprintf(FINFO, "[%s] add_exclude(%.*s, %s%sclude)\n",
550 - who_am_i(), (int)pat_len, cp, listp->debug_type,
551 - mflags & MATCHFLG_INCLUDE ? "in" : "ex");
552 + if (mflags & MATCHFLG_MERGE_FILE) {
553 + if (mflags & MATCHFLG_PERDIR_MERGE) {
554 + if (dirbuf_offset && *dirbuf == '/') {
555 + if (!(cp = parse_merge_name(cp, &pat_len)))
557 + make_exclude(listp, cp, pat_len, mflags);
561 + if (!(cp = parse_merge_name(cp, &pat_len)))
563 + add_exclude_file(listp, cp, xflags | XFLG_FATAL_ERRORS);
568 + make_exclude(listp, cp, pat_len, mflags);
572 @@ -321,7 +699,7 @@ void add_exclude_file(struct exclude_lis
576 - char line[MAXPATHLEN+3]; /* Room for "x " prefix and trailing slash. */
577 + char line[MAXPATHLEN+7]; /* Room for prefix chars and trailing slash. */
578 char *eob = line + sizeof line - 1;
579 int word_split = xflags & XFLG_WORD_SPLIT;
581 @@ -343,6 +721,11 @@ void add_exclude_file(struct exclude_lis
586 + rprintf(FINFO, "[%s] add_exclude_file(%s,%d)\n",
587 + who_am_i(), fname, xflags);
592 int ch, overflow = 0;
593 @@ -402,7 +785,21 @@ void send_exclude_list(int f)
594 if (ent->match_flags & MATCHFLG_INCLUDE) {
596 write_buf(f, "+ ", 2);
597 - } else if ((*p == '-' || *p == '+') && p[1] == ' ') {
598 + } else if (ent->match_flags & MATCHFLG_MERGE_FILE) {
599 + char buf[32], *op = buf;
602 + if (ent->match_flags & MATCHFLG_PERDIR_MERGE) {
605 + if (ent->match_flags & MATCHFLG_INHERIT)
609 + write_int(f, l + (op - buf));
610 + write_buf(f, buf, op - buf);
611 + } else if ((*p == '-' || *p == '+' || *p == '.')
614 write_buf(f, "- ", 2);
616 @@ -443,6 +840,7 @@ void add_cvs_excludes(void)
617 char fname[MAXPATHLEN];
620 + add_exclude(&exclude_list, ". -p .cvsignore", 0);
621 add_exclude(&exclude_list, default_cvsignore,
622 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
624 --- orig/flist.c 2004-08-05 21:57:29
625 +++ flist.c 2004-08-06 20:52:26
626 @@ -39,10 +39,9 @@ extern int module_id;
627 extern int ignore_errors;
628 extern int numeric_ids;
630 -extern int cvs_exclude;
633 extern char curr_dir[MAXPATHLEN];
634 +extern unsigned int curr_dir_len;
635 extern char *files_from;
636 extern int filesfrom_fd;
638 @@ -66,7 +65,6 @@ extern int list_only;
640 extern struct exclude_list_struct exclude_list;
641 extern struct exclude_list_struct server_exclude_list;
642 -extern struct exclude_list_struct local_exclude_list;
646 @@ -221,8 +219,6 @@ int link_stat(const char *path, STRUCT_S
648 static int check_exclude_file(char *fname, int is_dir, int exclude_level)
652 #if 0 /* This currently never happens, so avoid a useless compare. */
653 if (exclude_level == NO_EXCLUDES)
655 @@ -244,10 +240,7 @@ static int check_exclude_file(char *fnam
656 if (exclude_level != ALL_EXCLUDES)
658 if (exclude_list.head
659 - && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
661 - if (local_exclude_list.head
662 - && check_exclude(&local_exclude_list, fname, is_dir) < 0)
663 + && check_exclude(&exclude_list, fname, is_dir) < 0)
667 @@ -954,15 +947,7 @@ void send_file_name(int f, struct file_l
669 if (recursive && S_ISDIR(file->mode)
670 && !(file->flags & FLAG_MOUNT_POINT)) {
671 - struct exclude_list_struct last_list = local_exclude_list;
672 - local_exclude_list.head = local_exclude_list.tail = NULL;
673 send_directory(f, flist, f_name_to(file, fbuf));
675 - rprintf(FINFO, "[%s] popping %sexclude list\n",
676 - who_am_i(), local_exclude_list.debug_type);
678 - clear_exclude_list(&local_exclude_list);
679 - local_exclude_list = last_list;
683 @@ -973,6 +958,7 @@ static void send_directory(int f, struct
685 char fname[MAXPATHLEN];
687 + void *save_excludes;
691 @@ -996,18 +982,7 @@ static void send_directory(int f, struct
696 - if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
697 - < MAXPATHLEN - offset) {
698 - add_exclude_file(&local_exclude_list, fname,
699 - XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
701 - io_error |= IOERR_GENERAL;
703 - "cannot cvs-exclude in long-named directory %s\n",
704 - full_fname(fname));
707 + save_excludes = push_local_excludes(fname, offset);
709 for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
710 char *dname = d_name(di);
711 @@ -1028,6 +1003,8 @@ static void send_directory(int f, struct
712 rsyserr(FERROR, errno, "readdir(%s)", dir);
715 + pop_local_excludes(save_excludes);
720 @@ -1047,6 +1024,7 @@ struct file_list *send_file_list(int f,
721 char *p, *dir, olddir[sizeof curr_dir];
722 char lastpath[MAXPATHLEN] = "";
723 struct file_list *flist;
724 + void *first_push = NULL;
728 @@ -1067,6 +1045,14 @@ struct file_list *send_file_list(int f,
729 exit_cleanup(RERR_FILESELECT);
732 + if (curr_dir_len < MAXPATHLEN - 1) {
733 + char buf[MAXPATHLEN];
734 + strcpy(buf, curr_dir);
735 + buf[curr_dir_len] = '/';
736 + buf[curr_dir_len+1] = '\0';
737 + first_push = push_local_excludes(buf,
743 @@ -1097,6 +1083,22 @@ struct file_list *send_file_list(int f,
749 + if ((p = strrchr(fname, '/')) != NULL) {
756 + if ((ch = *p) != '\0')
758 + first_push = push_local_excludes(dir, p - dir);
763 if (link_stat(fname, &st, keep_dirlinks) != 0) {
765 io_error |= IOERR_GENERAL;
766 --- orig/options.c 2004-08-05 21:57:29
767 +++ options.c 2004-08-05 21:57:19
768 @@ -389,6 +389,7 @@ static struct poptOption long_options[]
769 {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors, 0, 0, 0 },
770 {"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
771 {"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
772 + {0, 'E', POPT_ARG_NONE, 0, 'E', 0, 0 },
773 {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
774 {"config", 0, POPT_ARG_STRING, &config_file, 0, 0, 0 },
775 {"port", 0, POPT_ARG_INT, &rsync_port, 0, 0, 0 },
776 @@ -589,6 +590,11 @@ int parse_arguments(int *argc, const cha
781 + add_exclude(&exclude_list,
782 + ". -ip /.rsync-excludes", 0);
788 --- orig/rsync.h 2004-08-03 15:41:32
789 +++ rsync.h 2004-08-06 06:23:10
790 @@ -499,11 +499,18 @@ struct map_struct {
791 #define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */
792 #define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */
793 #define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */
794 +#define MATCHFLG_MERGE_FILE (1<<7) /* specifies a file to merge */
795 +#define MATCHFLG_CVSIGNORE (1<<8) /* parse this as a .cvsignore file */
796 +#define MATCHFLG_PERDIR_MERGE (1<<9) /* content is inherited by subdirs */
797 +#define MATCHFLG_INHERIT (1<<10)/* content is inherited by subdirs */
798 struct exclude_struct {
799 struct exclude_struct *next;
801 unsigned int match_flags;
805 + struct exclude_list_struct *mergelist;
809 struct exclude_list_struct {
810 --- orig/rsync.yo 2004-08-03 15:34:32
811 +++ rsync.yo 2004-08-06 17:05:29
812 @@ -335,6 +335,7 @@ verb(
813 --include=PATTERN don't exclude files matching PATTERN
814 --include-from=FILE don't exclude patterns listed in FILE
815 --files-from=FILE read FILE for list of source-file names
816 + -E same as --exclude='. -pi /.rsync-excludes'
817 -0 --from0 all file lists are delimited by nulls
818 --version print version number
819 --daemon run as an rsync daemon
820 @@ -1086,6 +1087,11 @@ itemize(
821 then it is always considered an exclude pattern, even if specified as
822 part of an include option. The prefix is discarded before matching.
824 + it() if the pattern starts with ". " (a dot followed by a space) then its
825 + pattern is taken to be a merge file that is read in to supplement the
826 + current rules. See the section on MERGING EXCLUDE FILES for more
829 it() if the pattern is a single exclamation mark ! then the current
830 include/exclude list is reset, removing all previously defined patterns.
832 @@ -1138,6 +1144,106 @@ itemize(
833 it would be excluded by the "*")
836 +manpagesection(MERGING EXCLUDE FILES)
838 +You can merge whole files into an exclude file by specifying a rule that
839 +starts with a ". " (a dot followed by a space) and putting a filename in
840 +place of the pattern. The filename may be preceded by one or more options:
844 +dit(bf(-i)) All subdirectories of the current directory inherit the rules we
845 +read in from this file. Only affects a per-directory merge file. The
846 +rules read in are prefixed to the inherited rules from a parent directory,
847 +which gives the newest rules a higher priority than the inherited rules.
849 +Note also that you can eliminate all the inherited rules for a directory
850 +and its subdirectories by putting the list-clearing token ! at the start of
851 +a per-directory file. This only clears the rules in the current sub-list,
854 +dit(bf(-p)) Make the file a per-directory merge-file. Rsync will scan
855 +every directory that it traverses for the named file, merging its contents
856 +when the file exists. Without this option rsync just merges the rules into
857 +the parent file, giving them the same attributes as the parent.
859 +dit(bf(--)) End the scanning of options. Useful if you want to specify a
860 +filename that begins with a dash.
864 +Here's an example exclude file (which you'd specify via the normal
865 +--exclude-from=FILE option):
868 + . /home/user/.global_excludes
875 +This will merge the contents of the /home/user/.global_excludes file at the
876 +start of the list and also turns the ".excl" filename into a per-directory
877 +exclude file. The rules read in from the .global_excludes file affect all
878 +the directories because it is is being merged into an --exclude-from
879 +option. The rules merged from each directory's .excl file are inherited
880 +by each directory's subdirectories because the -i option was specified
881 +(without -i the rules would only affect the directory where they were read
882 +in). All the merged rules default to being exclude rules because an
883 +exclude statement was used to specify them.
885 +Note also that the parsing of any merge-file named ".cvsignore" is always
886 +done in a CVS-compatible manner, even if -C wasn't specified. This means
887 +that its rules are always excludes (even if an include option specified the
888 +file), tokens are split on whitespace, the rules are never inherited, and
889 +no special characters are honored (e.g. no comments, no "!", etc.).
891 +Additionally, you can affect where the --cvs-exclude (-C) option's
892 +inclusion of the per-directory .cvsignore file gets placed into your rules
893 +by adding your own explicit per-directory merge rule for ".cvsignore".
894 +Without this rsync would add its this rule at the end of all your other
895 +rules (giving it a lower priority than your command-line rules). For
896 +example, specifying this:
899 + rsync -avC --exclude='. -p .cvsignore' --exclude-from=foo a/ b
902 +will merge all the per-directory .cvsignore rules at the start of your list
903 +rather than at the end. This allows their dir-specific rules to supersede
904 +your rules instead of being subservient to them. (The global rules taken
905 +from the $HOME/.cvsignore file and from $CVSIGNORE are not repositioned by
908 +If a per-directory merge file is specified with a path that is a parent
909 +directory of the first transfer directory, rsync will scan all the parent
910 +dirs from that starting point to the transfer directory for the indicated
911 +per-directory file. For instance, the -E option is an abbreviation for
915 + --exclude='. -pi /.rsync-excludes'
918 +That exclude tells rsync to scan for the file .rsync-excludes in all
919 +directories from the root up through the source of the transfer. For an
920 +rsync daemon, the root dir is always the module's "path" setting, not the
921 +root of the filesystem (unless the two are the same).
923 +Some examples of this pre-scanning for per-directory files:
926 + rsync -avE /src/path/ /dest/dir
927 + rsync -av --exclude='. -p ../../.rsync-excludes' /src/path/ /dest/dir
928 + rsync -av --exclude='. -pi .rsync-excludes' /src/path/ /dest/dir
931 +The first two commands above will look for .rsync-excludes in "/" and
932 +"/src" before the normal scan begins looking for the file in "/src/path"
933 +and its subdirectories. The last command above just starts scanning
936 manpagesection(BATCH MODE)
938 bf(Note:) Batch mode should be considered experimental in this version
939 --- orig/testsuite/exclude.test 2004-05-29 21:25:45
940 +++ testsuite/exclude.test 2004-08-06 09:02:29
941 @@ -23,19 +23,47 @@ export HOME CVSIGNORE
942 makepath "$fromdir/foo/down/to/you"
943 makepath "$fromdir/bar/down/to/foo/too"
944 makepath "$fromdir/mid/for/foo/and/that/is/who"
945 +cat >"$fromdir/.excl" <<EOF
951 echo kept >"$fromdir/foo/file1"
952 echo removed >"$fromdir/foo/file2"
953 echo cvsout >"$fromdir/foo/file2.old"
954 +cat >"$fromdir/foo/.excl" <<EOF
958 +cat >"$fromdir/bar/.excl" <<EOF
963 echo cvsout >"$fromdir/bar/down/to/home-cvs-exclude"
964 +cat >"$fromdir/bar/down/to/.excl2" <<EOF
967 echo keeper >"$fromdir/bar/down/to/foo/file1"
968 echo cvsout >"$fromdir/bar/down/to/foo/file1.bak"
969 echo gone >"$fromdir/bar/down/to/foo/file3"
970 echo lost >"$fromdir/bar/down/to/foo/file4"
971 echo cvsout >"$fromdir/bar/down/to/foo/file4.junk"
972 echo smashed >"$fromdir/bar/down/to/foo/to"
973 +cat >"$fromdir/bar/down/to/foo/.excl2" <<EOF
976 +# This one should be ineffectual
977 +cat >"$fromdir/mid/.excl2" <<EOF
980 echo cvsout >"$fromdir/mid/one-in-one-out"
981 echo one-in-one-out >"$fromdir/mid/.cvsignore"
982 echo cvsin >"$fromdir/mid/one-for-all"
983 +cat >"$fromdir/mid/.excl" <<EOF
986 echo cvsin >"$fromdir/mid/for/one-in-one-out"
987 echo expunged >"$fromdir/mid/for/foo/extra"
988 echo retained >"$fromdir/mid/for/foo/keep"
989 @@ -100,5 +128,24 @@ $RSYNC -av --existing --include='*/' --e
990 checkit "$RSYNC -avvC --exclude-from=\"$excl\" \
991 --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
993 +# Modify the chk dir for our merge-exclude test and then tweak the dir times.
996 +rm "$chkdir"/foo/file1
997 +rm "$chkdir"/bar/.excl
998 +rm "$chkdir"/bar/down/to/.excl2
999 +rm "$chkdir"/bar/down/to/foo/.excl2
1000 +rm "$chkdir"/mid/.excl
1001 +cp -p "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
1002 +cp -p "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo
1004 +$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/"
1006 +# Now, test if rsync excludes the same files, this time with a merge-exclude
1009 +checkit "$RSYNC -avv --exclude='. -pi .excl' --exclude-from=\"$excl\" \
1010 + --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
1012 # The script would have aborted on error, so getting here means we've won.