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 without slashes, that
8 filename will be looked for in every subdirectory that rsync visits,
9 and its rules will affect the current directory and its subdirectories.
13 rsync -av --exclude='. .excl' from/ to
15 The above will look for a file named ".excl" in every directory of the
16 hierarchy that rsync visits, and it will exclude (by default) names
17 based on the rules found therein. If one of the .excl files contains
25 Then the file ".excl2" will also be read in the current dir, and all
26 subdirs of the current dir. The file ".excl3" would just be read in
27 for the current dir because its name contained a slash.
31 --- exclude.c 14 May 2004 21:23:41 -0000 1.76
32 +++ exclude.c 15 May 2004 02:45:44 -0000
33 @@ -30,32 +30,58 @@ extern int verbose;
38 +extern int sanitize_paths;
40 extern char curr_dir[];
42 -struct exclude_list_struct exclude_list = { 0, 0, "" };
43 -struct exclude_list_struct local_exclude_list = { 0, 0, "per-dir .cvsignore " };
44 -struct exclude_list_struct server_exclude_list = { 0, 0, "server " };
45 +struct exclude_list_struct exclude_list = { 0, 0, 0, "" };
46 +struct exclude_list_struct server_exclude_list = { 0, 0, 0, "server " };
47 char *exclude_path_prefix = NULL;
49 +struct exclude_list_root {
50 + struct exclude_list_struct *head;
54 +static char dirbuf[MAXPATHLEN];
55 +static unsigned int dirbuf_offset = 0;
57 /** Build an exclude structure given a exclude pattern */
58 -static void make_exclude(struct exclude_list_struct *listp, const char *pattern,
59 - int pat_len, int include)
60 +static void make_exclude(struct exclude_list_struct *listp, const char *pat,
61 + unsigned int pat_len, int mflags)
63 struct exclude_struct *ret;
66 + unsigned int ex_len;
68 + if (mflags & MATCHFLG_MERGE_FILE) {
69 + struct exclude_struct *ex;
70 + /* If the local include file was already mentioned, don't
72 + for (ex = listp->head; ex; ex = ex->next) {
73 + if ((ex->match_flags & MATCHFLG_MERGE_FILE)
74 + && strlen(ex->pattern) == pat_len
75 + && strncmp(ex->pattern, pat, pat_len) == 0)
78 + if ((pat_len == 10 || (pat_len > 10 && pat[pat_len-11] == '/'))
79 + && strncmp(pat+pat_len-10, ".cvsignore", 10) == 0) {
80 + mflags |= MATCHFLG_CVSIGNORE;
81 + mflags &= ~MATCHFLG_INCLUDE;
83 + mflags &= ~MATCHFLG_CVSIGNORE;
86 ret = new(struct exclude_struct);
88 out_of_memory("make_exclude");
90 memset(ret, 0, sizeof ret[0]);
91 - ret->include = include;
93 if (exclude_path_prefix)
94 - ret->match_flags |= MATCHFLG_ABS_PATH;
95 - if (exclude_path_prefix && *pattern == '/')
96 + mflags |= MATCHFLG_ABS_PATH;
97 + if (exclude_path_prefix && *pat == '/')
98 ex_len = strlen(exclude_path_prefix);
101 @@ -64,33 +90,52 @@ static void make_exclude(struct exclude_
102 out_of_memory("make_exclude");
104 memcpy(ret->pattern, exclude_path_prefix, ex_len);
105 - strlcpy(ret->pattern + ex_len, pattern, pat_len + 1);
106 + strlcpy(ret->pattern + ex_len, pat, pat_len + 1);
109 if (strpbrk(ret->pattern, "*[?")) {
110 - ret->match_flags |= MATCHFLG_WILD;
111 + mflags |= MATCHFLG_WILD;
112 if ((cp = strstr(ret->pattern, "**")) != NULL) {
113 - ret->match_flags |= MATCHFLG_WILD2;
114 + mflags |= MATCHFLG_WILD2;
115 /* If the pattern starts with **, note that. */
116 if (cp == ret->pattern)
117 - ret->match_flags |= MATCHFLG_WILD2_PREFIX;
118 + mflags |= MATCHFLG_WILD2_PREFIX;
122 if (pat_len > 1 && ret->pattern[pat_len-1] == '/') {
123 ret->pattern[pat_len-1] = 0;
124 - ret->directory = 1;
125 + mflags |= MATCHFLG_DIRECTORY;
128 for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++)
132 + if (!listp->tail) {
133 + ret->next = listp->head;
134 listp->head = listp->tail = ret;
137 + ret->next = listp->tail->next;
138 listp->tail->next = ret;
142 + if (mflags & MATCHFLG_MERGE_FILE) {
143 + struct exclude_list_struct *lp;
144 + int ndx = local_lists.cnt++;
145 + local_lists.head = realloc_array(local_lists.head,
146 + struct exclude_list_struct, local_lists.cnt);
147 + if (!local_lists.head)
148 + out_of_memory("make_exclude");
149 + lp = &local_lists.head[ndx];
150 + lp->head = lp->tail = NULL;
151 + if (asprintf(&lp->debug_type, "per-dir %s ", ret->pattern) < 0)
152 + out_of_memory("make_exclude");
154 + ret->slash_cnt = ndx;
157 + ret->match_flags = mflags;
160 static void free_exclude(struct exclude_struct *ex)
161 @@ -99,18 +144,90 @@ static void free_exclude(struct exclude_
165 -void free_exclude_list(struct exclude_list_struct *listp)
166 +static void free_exclude_list(struct exclude_list_struct *listp)
168 - struct exclude_struct *ent, *next;
170 - for (ent = listp->head; ent; ent = next) {
174 + struct exclude_struct *ent, *next;
175 + /* Truncate any extra parent items from local list. */
176 + listp->tail->next = NULL;
177 + for (ent = listp->head; ent; ent = next) {
183 listp->head = listp->tail = NULL;
186 +void *push_local_excludes(char *fname, unsigned int offset)
189 + struct exclude_list_root *push = new_array(struct exclude_list_root, 1);
192 + out_of_memory("push_local_excludes");
194 + push->cnt = local_lists.cnt;
195 + push->head = new_array(struct exclude_list_struct, local_lists.cnt);
197 + out_of_memory("push_local_excludes");
199 + memcpy(push->head, local_lists.head,
200 + sizeof (struct exclude_list_struct) * local_lists.cnt);
202 + /* Make it easy to construct the full path for a merge that has
203 + * a relative path by saving it off. */
204 + memcpy(dirbuf, fname, offset);
205 + dirbuf_offset = offset;
207 + for (i = 0; i < local_lists.cnt; i++) {
208 + struct exclude_list_struct *listp = &local_lists.head[i];
209 + char *file = listp->parent->pattern;
213 + rprintf(FINFO, "[%s] pushing %sexclude list\n",
214 + who_am_i(), listp->debug_type);
216 + if (listp->parent->match_flags & MATCHFLG_CVSIGNORE) {
217 + flags = XFLG_WORD_SPLIT | XFLG_WORDS_ONLY;
218 + listp->head = NULL; /* Subdirs don't get our rules. */
220 + flags = listp->parent->match_flags & MATCHFLG_INCLUDE
221 + ? XFLG_DEF_INCLUDE : 0;
223 + listp->tail = NULL;
224 + if (strlcpy(fname + offset, file, MAXPATHLEN - offset)
225 + < MAXPATHLEN - offset)
226 + add_exclude_file(listp, fname, flags);
228 + io_error |= IOERR_GENERAL;
230 + "cannot add local excludes in long-named directory %s\n",
231 + full_fname(fname));
235 + return (void*)push;
238 +void pop_local_excludes(void *mem)
242 + for (i = 0; i < local_lists.cnt; i++) {
243 + struct exclude_list_struct *listp = &local_lists.head[i];
245 + rprintf(FINFO, "[%s] popping %sexclude list\n",
246 + who_am_i(), listp->debug_type);
248 + free_exclude_list(listp);
250 + free(local_lists.head);
251 + local_lists = *(struct exclude_list_root*)mem;
255 static int check_one_exclude(char *name, struct exclude_struct *ex,
258 @@ -134,7 +251,8 @@ static int check_one_exclude(char *name,
260 if (!name[0]) return 0;
262 - if (ex->directory && !name_is_dir) return 0;
263 + if ((ex->match_flags & MATCHFLG_DIRECTORY) && !name_is_dir)
266 if (*pattern == '/') {
268 @@ -201,9 +319,11 @@ static void report_exclude_result(char c
271 rprintf(FINFO, "[%s] %scluding %s %s because of %spattern %s%s\n",
272 - who_am_i(), ent->include ? "in" : "ex",
274 + ent->match_flags & MATCHFLG_INCLUDE ? "in" : "ex",
275 name_is_dir ? "directory" : "file", name, type,
276 - ent->pattern, ent->directory ? "/" : "");
278 + ent->match_flags & MATCHFLG_DIRECTORY ? "/" : "");
282 @@ -217,10 +337,18 @@ int check_exclude(struct exclude_list_st
283 struct exclude_struct *ent;
285 for (ent = listp->head; ent; ent = ent->next) {
286 + if (ent->match_flags & MATCHFLG_MERGE_FILE) {
287 + struct exclude_list_struct *lp
288 + = &local_lists.head[ent->slash_cnt];
289 + int rc = check_exclude(lp, name, name_is_dir);
294 if (check_one_exclude(name, ent, name_is_dir)) {
295 report_exclude_result(name, ent, name_is_dir,
297 - return ent->include ? 1 : -1;
298 + return (ent->match_flags & MATCHFLG_INCLUDE) ? 1 : -1;
302 @@ -236,11 +364,11 @@ int check_exclude(struct exclude_list_st
303 * *incl_ptr value will be 1 for an include, 0 for an exclude, and -1 for
304 * the list-clearing "!" token.
306 -static const char *get_exclude_tok(const char *p, int *len_ptr, int *incl_ptr,
307 +static const char *get_exclude_tok(const char *p, int *len_ptr, int *flag_ptr,
310 const unsigned char *s = (const unsigned char *)p;
312 + int len, mflags = 0;
314 if (xflags & XFLG_WORD_SPLIT) {
315 /* Skip over any initial whitespace. */
316 @@ -250,13 +378,19 @@ static const char *get_exclude_tok(const
320 - /* Is this a '+' or '-' followed by a space (not whitespace)? */
321 + /* Is this a +/-/. followed by a space (not whitespace)? */
322 if (!(xflags & XFLG_WORDS_ONLY)
323 - && (*s == '-' || *s == '+') && s[1] == ' ') {
324 - *incl_ptr = *s == '+';
325 + && (*s == '-' || *s == '+' || *s == '.') && s[1] == ' ') {
327 + mflags |= MATCHFLG_INCLUDE;
328 + else if (*s == '.') {
329 + mflags |= MATCHFLG_MERGE_FILE;
330 + if (xflags & XFLG_DEF_INCLUDE)
331 + mflags |= MATCHFLG_INCLUDE;
335 - *incl_ptr = xflags & XFLG_DEF_INCLUDE;
336 + } else if (xflags & XFLG_DEF_INCLUDE)
337 + mflags |= MATCHFLG_INCLUDE;
339 if (xflags & XFLG_WORD_SPLIT) {
340 const unsigned char *cp = s;
341 @@ -268,9 +402,10 @@ static const char *get_exclude_tok(const
344 if (*p == '!' && len == 1 && !(xflags & XFLG_WORDS_ONLY))
346 + mflags |= MATCHFLG_CLEAR_LIST;
349 + *flag_ptr = mflags;
350 return (const char *)s;
353 @@ -278,7 +413,7 @@ static const char *get_exclude_tok(const
354 void add_exclude(struct exclude_list_struct *listp, const char *pattern,
358 + int pat_len, mflags;
362 @@ -287,27 +422,49 @@ void add_exclude(struct exclude_list_str
366 - cp = get_exclude_tok(cp + pat_len, &pat_len, &incl, xflags);
367 + cp = get_exclude_tok(cp + pat_len, &pat_len, &mflags, xflags);
370 - /* If we got the special "!" token, clear the list. */
372 + if (mflags & MATCHFLG_CLEAR_LIST) {
375 "[%s] clearing %sexclude list\n",
376 who_am_i(), listp->debug_type);
378 free_exclude_list(listp);
380 - make_exclude(listp, cp, pat_len, incl);
383 - rprintf(FINFO, "[%s] add_exclude(%.*s, %s%s)\n",
384 - who_am_i(), pat_len, cp,
386 - incl ? "include" : "exclude");
389 + if (mflags & MATCHFLG_MERGE_FILE) {
390 + char name[MAXPATHLEN];
391 + if ((unsigned) pat_len >= sizeof name)
392 + continue; /* XXX complain? */
393 + strlcpy(name, cp, pat_len+1);
394 + if (strchr(name, '/') != NULL) {
395 + if (sanitize_paths)
396 + sanitize_path(name, curr_dir);
400 + if (strlcpy(dirbuf + dirbuf_offset,
401 + name, MAXPATHLEN - dirbuf_offset)
402 + >= MAXPATHLEN - dirbuf_offset)
403 + continue; /* XXX complain? */
406 + add_exclude_file(listp, cp,
407 + xflags | XFLG_FATAL_ERRORS);
412 + make_exclude(listp, cp, pat_len, mflags);
415 + rprintf(FINFO, "[%s] add_exclude(%.*s, %s%s%sclude)\n",
416 + who_am_i(), pat_len, cp, listp->debug_type,
417 + mflags & MATCHFLG_MERGE_FILE ? "FILE " : "",
418 + mflags & MATCHFLG_INCLUDE ? "in" : "ex");
423 @@ -383,15 +540,19 @@ void send_exclude_list(int f)
424 l = strlcpy(p, ent->pattern, sizeof p);
425 if (l == 0 || l >= MAXPATHLEN)
427 - if (ent->directory) {
428 + if (ent->match_flags & MATCHFLG_DIRECTORY) {
433 - if (ent->include) {
434 + if (ent->match_flags & MATCHFLG_INCLUDE) {
436 write_buf(f, "+ ", 2);
437 - } else if ((*p == '-' || *p == '+') && p[1] == ' ') {
438 + } else if (ent->match_flags & MATCHFLG_MERGE_FILE) {
439 + write_int(f, l + 2);
440 + write_buf(f, ". ", 2);
441 + } else if ((*p == '-' || *p == '+' || *p == '.')
444 write_buf(f, "- ", 2);
446 @@ -432,6 +593,7 @@ void add_cvs_excludes(void)
447 char fname[MAXPATHLEN];
450 + add_exclude(&exclude_list, ". .cvsignore", 0);
451 add_exclude(&exclude_list, default_cvsignore,
452 XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
454 --- flist.c 14 May 2004 21:23:41 -0000 1.222
455 +++ flist.c 15 May 2004 02:45:44 -0000
456 @@ -39,8 +39,6 @@ extern int module_id;
457 extern int ignore_errors;
458 extern int numeric_ids;
460 -extern int cvs_exclude;
463 extern char curr_dir[MAXPATHLEN];
464 extern char *files_from;
465 @@ -65,7 +63,6 @@ extern int write_batch;
467 extern struct exclude_list_struct exclude_list;
468 extern struct exclude_list_struct server_exclude_list;
469 -extern struct exclude_list_struct local_exclude_list;
473 @@ -210,8 +207,6 @@ int link_stat(const char *path, STRUCT_S
475 static int check_exclude_file(char *fname, int is_dir, int exclude_level)
479 #if 0 /* This currently never happens, so avoid a useless compare. */
480 if (exclude_level == NO_EXCLUDES)
482 @@ -233,10 +228,7 @@ static int check_exclude_file(char *fnam
483 if (exclude_level != ALL_EXCLUDES)
485 if (exclude_list.head
486 - && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0)
488 - if (local_exclude_list.head
489 - && check_exclude(&local_exclude_list, fname, is_dir) < 0)
490 + && check_exclude(&exclude_list, fname, is_dir) < 0)
494 @@ -946,15 +938,7 @@ void send_file_name(int f, struct file_l
496 if (recursive && S_ISDIR(file->mode)
497 && !(file->flags & FLAG_MOUNT_POINT)) {
498 - struct exclude_list_struct last_list = local_exclude_list;
499 - local_exclude_list.head = local_exclude_list.tail = NULL;
500 send_directory(f, flist, f_name_to(file, fbuf));
502 - rprintf(FINFO, "[%s] popping %sexclude list\n",
503 - who_am_i(), local_exclude_list.debug_type);
505 - free_exclude_list(&local_exclude_list);
506 - local_exclude_list = last_list;
510 @@ -965,6 +949,7 @@ static void send_directory(int f, struct
512 char fname[MAXPATHLEN];
514 + void *save_excludes;
518 @@ -989,18 +974,7 @@ static void send_directory(int f, struct
523 - if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset)
524 - < MAXPATHLEN - offset) {
525 - add_exclude_file(&local_exclude_list, fname,
526 - XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
528 - io_error |= IOERR_GENERAL;
530 - "cannot cvs-exclude in long-named directory %s\n",
531 - full_fname(fname));
534 + save_excludes = push_local_excludes(fname, offset);
536 for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
537 char *dname = d_name(di);
538 @@ -1021,6 +995,8 @@ static void send_directory(int f, struct
539 rprintf(FERROR, "readdir(%s): (%d) %s\n",
540 dir, errno, strerror(errno));
543 + pop_local_excludes(save_excludes);
547 --- rsync.h 13 May 2004 18:51:22 -0000 1.203
548 +++ rsync.h 15 May 2004 02:45:45 -0000
549 @@ -493,18 +493,21 @@ struct map_struct {
550 #define MATCHFLG_WILD2 (1<<1) /* pattern has '**' */
551 #define MATCHFLG_WILD2_PREFIX (1<<2) /* pattern starts with '**' */
552 #define MATCHFLG_ABS_PATH (1<<3) /* path-match on absolute path */
553 +#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */
554 +#define MATCHFLG_CLEAR_LIST (1<<5) /* this item is the "!" token */
555 +#define MATCHFLG_DIRECTORY (1<<6) /* this matches only directories */
556 +#define MATCHFLG_MERGE_FILE (1<<7) /* specifies a file to merge */
557 +#define MATCHFLG_CVSIGNORE (1<<8) /* parse this as a .cvsignore file */
558 struct exclude_struct {
559 struct exclude_struct *next;
567 struct exclude_list_struct {
568 - struct exclude_struct *head;
569 - struct exclude_struct *tail;
570 + struct exclude_struct *head, *tail;
571 + struct exclude_struct *parent;
575 --- rsync.yo 7 May 2004 00:18:37 -0000 1.169
576 +++ rsync.yo 15 May 2004 02:45:45 -0000
577 @@ -1075,6 +1075,72 @@ itemize(
578 it would be excluded by the "*")
581 +manpagesection(MERGING EXCLUDE FILES)
583 +You can merge whole files into an exclude file using a rule that starts
584 +with a ". " (a dot followed by a space) and has a filename in place of the
585 +pattern. There are two types of merge rules, single-instance and
589 + it() If the filename has no slashes in it, it is a per-directory merge;
590 + rsync scans every directory that is traversed and merges the named file's
591 + contents (when it exists), putting the contents of each subdirectory's
592 + file at the start of this per-directory sub-list (so subdirectories
593 + inherit the contents of their parent directories by default, but each
594 + subdirectory's rules have precedence over the parent's rules).
596 + it() If a filename has a slash in it, it is a single-instance merge; the
597 + named file's contents will be merged into the current exclude file,
598 + replacing the merge rule. Thus, you should use the name ./foo instead of
599 + foo if you don't want to scan for "foo" in all the subdirectories of the
603 +Note also that you can eliminate all the inherited rules for the current
604 +per-directory ruleset by putting the list-clearing token (!) in the file.
605 +This clears only the rules of the current per-directory sub-list (up
606 +through the token) and only for the current directory and its
609 +Here's an example. Specify the file that holds this set of rules via a
610 +normal --exclude-from option:
613 + . /home/user/.global_excludes
620 +This will merge the contents of the /home/user/.global_excludes file at the
621 +start of the list and also turns the ".excl" filename into a per-directory
622 +exclude file whose local contents will be merged into the list in place of
625 +Additionally, you can affect where the --cvs-exclude (-C) option's
626 +inclusion of a per-directory .cvsignore file gets placed into your rules by
627 +adding an explicit a merge rule for ".cvsignore". For instance, specifying
631 + rsync -avC --exclude='. .cvsignore' --exclude-from=foo a/ b
634 +will merge all the per-directory .cvsignore rules at the start of your list
635 +rather than at the end. This allows their dir-specific rules to supersede
636 +your rules instead of being subservient to them. (The global rules taken
637 +from the $HOME/.cvsignore file and from $CVSIGNORE are not affected by
640 +Note also that the parsing of any merge-file named ".cvsignore" is always
641 +done in a CVS-compatible manner (even if -C wasn't specified) -- i.e. the
642 +rules are always exclude rules (even when specified by an include option),
643 +they are split on whitespace, no special prefixes or list-clearing tokens
644 +are honored, and (for per-directory files) subdirectories don't inherit the
645 +parent directory's rules.
647 manpagesection(BATCH MODE)
649 bf(Note:) Batch mode should be considered experimental in this version