Commit | Line | Data |
---|---|---|
8a529471 WD |
1 | After applying this patch and running configure, you MUST run this |
2 | command before "make": | |
3 | ||
4 | make proto | |
5 | ||
524989ae WD |
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, | |
0c7d1fd8 WD |
9 | and the rules found in that subdirectory's file will affect that dir |
10 | and its subdirectories. | |
a55d21aa WD |
11 | |
12 | For example: | |
13 | ||
14 | rsync -av --exclude='. .excl' from/ to | |
15 | ||
16 | The above will look for a file named ".excl" in every directory of the | |
524989ae WD |
17 | hierarchy that rsync visits, and it will exclude (by default) names |
18 | based on the rules found therein. If one of the .excl files contains | |
19 | this: | |
a55d21aa WD |
20 | |
21 | + *.c | |
524989ae WD |
22 | . .excl2 |
23 | . ./.excl3 | |
24 | *.o | |
a55d21aa | 25 | |
524989ae WD |
26 | Then the file ".excl2" will also be read in the current dir, and all |
27 | subdirs of the current dir. The file ".excl3" would just be read in | |
28 | for the current dir because its name contained a slash. | |
a55d21aa WD |
29 | |
30 | ..wayne.. | |
31 | ||
066e3b3e | 32 | --- exclude.c 22 May 2004 05:32:20 -0000 1.82 |
c4e46f36 | 33 | +++ exclude.c 24 May 2004 00:44:00 -0000 |
eabda998 | 34 | @@ -30,13 +30,56 @@ extern int verbose; |
a55d21aa WD |
35 | extern int eol_nulls; |
36 | extern int list_only; | |
37 | extern int recurse; | |
38 | +extern int io_error; | |
39 | +extern int sanitize_paths; | |
40 | ||
41 | extern char curr_dir[]; | |
42 | ||
d8af8661 | 43 | struct exclude_list_struct exclude_list = { 0, 0, "" }; |
524989ae | 44 | -struct exclude_list_struct local_exclude_list = { 0, 0, "per-dir .cvsignore " }; |
d8af8661 | 45 | struct exclude_list_struct server_exclude_list = { 0, 0, "server " }; |
a55d21aa | 46 | char *exclude_path_prefix = NULL; |
eabda998 WD |
47 | +struct exclude_struct **mergelist_parents; |
48 | +int mergelist_cnt = 0; | |
49 | +int mergelist_size = 0; | |
d8af8661 | 50 | + |
eabda998 | 51 | +struct mergelist_save_struct { |
d1e7c1c8 | 52 | + struct exclude_list_struct *array; |
d8af8661 WD |
53 | + int count; |
54 | +}; | |
524989ae | 55 | + |
a55d21aa WD |
56 | +static char dirbuf[MAXPATHLEN]; |
57 | +static unsigned int dirbuf_offset = 0; | |
a55d21aa | 58 | + |
d1e7c1c8 WD |
59 | +/* Each exclude_list_struct describes a singly-linked list by keeping track |
60 | + * of both the head and tail pointers. The list is slightly unusual in that | |
61 | + * a parent-dir's content can be appended to the end of the local list in a | |
62 | + * special way: the last item in the local list has its "next" pointer set | |
0c7d1fd8 | 63 | + * to point to the inherited list, but the local list's tail pointer points |
d1e7c1c8 | 64 | + * at the end of the local list. Thus, if the local list is empty, the head |
0c7d1fd8 | 65 | + * will be pointing at the inherited content but the tail will be NULL. To |
d1e7c1c8 WD |
66 | + * help you visualize this, here are the possible list arrangements: |
67 | + * | |
68 | + * Completely Empty Local Content Only | |
69 | + * ================================== ==================================== | |
70 | + * head -> NULL head -> Local1 -> Local2 -> NULL | |
71 | + * tail -> NULL tail -------------^ | |
72 | + * | |
73 | + * Inherited Content Only Both Local and Inherited Content | |
74 | + * ================================== ==================================== | |
75 | + * head -> Parent1 -> Parent2 -> NULL head -> L1 -> L2 -> P1 -> P2 -> NULL | |
76 | + * tail -> NULL tail ---------^ | |
77 | + * | |
78 | + * This means that anyone wanting to traverse the whole list to USE it just | |
79 | + * needs to start at the head and use the "next" pointers until it goes | |
80 | + * NULL. To add new local content, we insert the item after the tail item | |
81 | + * and update the tail (obviously, if "tail" was NULL, we insert it at the | |
82 | + * head). To clear the local list, WE MUST NOT FREE THE INHERITED CONTENT | |
bc95f62b WD |
83 | + * because it is shared between the current list and our parent list(s). |
84 | + * The easiest way to handle this is to simply truncate the list after the | |
85 | + * tail item and then free the local list from the head. When inheriting | |
86 | + * the list for a new local dir, we just save off the exclude_list_struct | |
0c7d1fd8 | 87 | + * values (so we can pop back to them later) and set the tail to NULL. |
d1e7c1c8 | 88 | + */ |
d8af8661 | 89 | |
0c7d1fd8 WD |
90 | /** Build an exclude structure given an exclude pattern. */ |
91 | static void make_exclude(struct exclude_list_struct *listp, const char *pat, | |
eabda998 | 92 | @@ -46,6 +89,24 @@ static void make_exclude(struct exclude_ |
a55d21aa | 93 | const char *cp; |
0c7d1fd8 WD |
94 | unsigned int ex_len; |
95 | ||
524989ae | 96 | + if (mflags & MATCHFLG_MERGE_FILE) { |
eabda998 | 97 | + int i; |
a55d21aa | 98 | + /* If the local include file was already mentioned, don't |
524989ae | 99 | + * add it again. */ |
eabda998 WD |
100 | + for (i = 0; i < mergelist_cnt; i++) { |
101 | + struct exclude_struct *ex = mergelist_parents[i]; | |
102 | + if (strlen(ex->pattern) == pat_len | |
d8af8661 | 103 | + && memcmp(ex->pattern, pat, pat_len) == 0) |
a55d21aa WD |
104 | + return; |
105 | + } | |
524989ae WD |
106 | + if ((pat_len == 10 || (pat_len > 10 && pat[pat_len-11] == '/')) |
107 | + && strncmp(pat+pat_len-10, ".cvsignore", 10) == 0) { | |
a55d21aa WD |
108 | + mflags |= MATCHFLG_CVSIGNORE; |
109 | + mflags &= ~MATCHFLG_INCLUDE; | |
110 | + } else | |
111 | + mflags &= ~MATCHFLG_CVSIGNORE; | |
112 | + } | |
0c7d1fd8 | 113 | + |
a55d21aa WD |
114 | ret = new(struct exclude_struct); |
115 | if (!ret) | |
116 | out_of_memory("make_exclude"); | |
eabda998 | 117 | @@ -81,14 +142,36 @@ static void make_exclude(struct exclude_ |
7b22909b | 118 | mflags |= MATCHFLG_DIRECTORY; |
a55d21aa WD |
119 | } |
120 | ||
7b22909b | 121 | - for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++) |
bc95f62b | 122 | - ret->slash_cnt++; |
524989ae | 123 | + if (mflags & MATCHFLG_MERGE_FILE) { |
d8af8661 WD |
124 | + struct exclude_list_struct *lp |
125 | + = new_array(struct exclude_list_struct, 1); | |
126 | + if (!lp) | |
a55d21aa | 127 | + out_of_memory("make_exclude"); |
7cb7ae4e | 128 | + lp->head = lp->tail = NULL; |
524989ae | 129 | + if (asprintf(&lp->debug_type, "per-dir %s ", ret->pattern) < 0) |
a55d21aa | 130 | + out_of_memory("make_exclude"); |
eabda998 WD |
131 | + ret->u.mergelist = lp; |
132 | + if (mergelist_cnt == mergelist_size) { | |
133 | + mergelist_size += 5; | |
134 | + mergelist_parents = realloc_array(mergelist_parents, | |
135 | + struct exclude_struct *, | |
136 | + mergelist_size); | |
137 | + if (!mergelist_parents) | |
138 | + out_of_memory("make_exclude"); | |
139 | + } | |
140 | + mergelist_parents[mergelist_cnt++] = ret; | |
7b22909b WD |
141 | + } else { |
142 | + for (cp = ret->pattern; (cp = strchr(cp, '/')) != NULL; cp++) | |
143 | + ret->u.slash_cnt++; | |
abe86b1f | 144 | + } |
7b22909b | 145 | |
0c7d1fd8 | 146 | ret->match_flags = mflags; |
a55d21aa | 147 | |
7b22909b WD |
148 | - if (!listp->tail) |
149 | + if (!listp->tail) { | |
150 | + ret->next = listp->head; | |
151 | listp->head = listp->tail = ret; | |
152 | - else { | |
153 | + } else { | |
154 | + ret->next = listp->tail->next; | |
155 | listp->tail->next = ret; | |
156 | listp->tail = ret; | |
157 | } | |
dc5cce3c | 158 | @@ -96,22 +179,116 @@ static void make_exclude(struct exclude_ |
d8af8661 WD |
159 | |
160 | static void free_exclude(struct exclude_struct *ex) | |
161 | { | |
162 | + if (ex->match_flags & MATCHFLG_MERGE_FILE) { | |
eabda998 WD |
163 | + free(ex->u.mergelist->debug_type); |
164 | + free(ex->u.mergelist); | |
d8af8661 WD |
165 | + } |
166 | free(ex->pattern); | |
a55d21aa WD |
167 | free(ex); |
168 | } | |
169 | ||
d8af8661 WD |
170 | -void clear_exclude_list(struct exclude_list_struct *listp) |
171 | +static void clear_exclude_list(struct exclude_list_struct *listp) | |
a55d21aa | 172 | { |
7cb7ae4e WD |
173 | - struct exclude_struct *ent, *next; |
174 | - | |
175 | - for (ent = listp->head; ent; ent = next) { | |
176 | - next = ent->next; | |
177 | - free_exclude(ent); | |
178 | + if (listp->tail) { | |
179 | + struct exclude_struct *ent, *next; | |
bc95f62b | 180 | + /* Truncate any inherited items from the local list. */ |
7cb7ae4e | 181 | + listp->tail->next = NULL; |
dc5cce3c | 182 | + /* Now free everything that is left. */ |
7cb7ae4e WD |
183 | + for (ent = listp->head; ent; ent = next) { |
184 | + next = ent->next; | |
185 | + free_exclude(ent); | |
186 | + } | |
524989ae WD |
187 | } |
188 | ||
7cb7ae4e WD |
189 | listp->head = listp->tail = NULL; |
190 | } | |
a55d21aa | 191 | |
eabda998 | 192 | +void *push_local_excludes(char *fname, unsigned int offset) |
a55d21aa | 193 | +{ |
eabda998 WD |
194 | + struct mergelist_save_struct *push; |
195 | + struct exclude_list_struct *ap; | |
196 | + int i; | |
197 | + | |
198 | + /* Make it easy to construct the full path for a merge-file that was | |
199 | + * specified with a relative path by saving off the current dir. */ | |
200 | + memcpy(dirbuf, fname, offset); | |
201 | + dirbuf_offset = offset; | |
202 | + | |
203 | + if (!(push = new_array(struct mergelist_save_struct, 1))) | |
204 | + out_of_memory("push_local_excludes"); | |
205 | + | |
206 | + push->count = mergelist_cnt; | |
207 | + push->array = new_array(struct exclude_list_struct, mergelist_cnt); | |
208 | + if (!push->array) | |
209 | + out_of_memory("push_local_excludes"); | |
524989ae | 210 | + |
eabda998 WD |
211 | + for (i = 0, ap = push->array; i < mergelist_cnt; i++) { |
212 | + memcpy(ap++, mergelist_parents[i]->u.mergelist, | |
213 | + sizeof (struct exclude_list_struct)); | |
214 | + } | |
215 | + | |
216 | + /* Note: add_exclude_file() might increase mergelist_cnt, so keep | |
217 | + * this loop separate from the above loop. */ | |
218 | + for (i = 0; i < mergelist_cnt; i++) { | |
219 | + struct exclude_struct *ex = mergelist_parents[i]; | |
220 | + struct exclude_list_struct *lp = ex->u.mergelist; | |
a55d21aa | 221 | + int flags; |
524989ae WD |
222 | + |
223 | + if (verbose > 2) { | |
224 | + rprintf(FINFO, "[%s] pushing %sexclude list\n", | |
d8af8661 | 225 | + who_am_i(), lp->debug_type); |
524989ae | 226 | + } |
d8af8661 | 227 | + |
eabda998 | 228 | + if (ex->match_flags & MATCHFLG_CVSIGNORE) { |
d8af8661 | 229 | + lp->head = NULL; /* CVS doesn't inherit rules. */ |
ee1af13c | 230 | + flags = XFLG_WORD_SPLIT | XFLG_WORDS_ONLY; |
a55d21aa | 231 | + } else { |
eabda998 | 232 | + flags = ex->match_flags & MATCHFLG_INCLUDE |
524989ae | 233 | + ? XFLG_DEF_INCLUDE : 0; |
a55d21aa | 234 | + } |
d8af8661 | 235 | + lp->tail = NULL; /* Switch any local rules to inherited. */ |
eabda998 | 236 | + if (strlcpy(dirbuf + dirbuf_offset, ex->pattern, |
d8af8661 WD |
237 | + MAXPATHLEN - dirbuf_offset) < MAXPATHLEN - dirbuf_offset) |
238 | + add_exclude_file(lp, dirbuf, flags); | |
524989ae | 239 | + else { |
a55d21aa WD |
240 | + io_error |= IOERR_GENERAL; |
241 | + rprintf(FINFO, | |
242 | + "cannot add local excludes in long-named directory %s\n", | |
d8af8661 | 243 | + full_fname(dirbuf)); |
a55d21aa WD |
244 | + } |
245 | + } | |
246 | + | |
524989ae | 247 | + return (void*)push; |
a55d21aa WD |
248 | +} |
249 | + | |
eabda998 | 250 | +void pop_local_excludes(void *mem) |
a55d21aa | 251 | +{ |
eabda998 WD |
252 | + struct mergelist_save_struct *pop = (struct mergelist_save_struct*)mem; |
253 | + struct exclude_list_struct *ap; | |
254 | + int i; | |
d8af8661 | 255 | + |
066e3b3e | 256 | + for (i = mergelist_cnt; i-- > 0; ) { |
eabda998 WD |
257 | + struct exclude_struct *ex = mergelist_parents[i]; |
258 | + struct exclude_list_struct *lp = ex->u.mergelist; | |
524989ae | 259 | + |
524989ae WD |
260 | + if (verbose > 2) { |
261 | + rprintf(FINFO, "[%s] popping %sexclude list\n", | |
d8af8661 | 262 | + who_am_i(), lp->debug_type); |
524989ae | 263 | + } |
d8af8661 WD |
264 | + |
265 | + clear_exclude_list(lp); | |
a55d21aa | 266 | + } |
d8af8661 | 267 | + |
eabda998 WD |
268 | + mergelist_cnt = pop->count; |
269 | + for (i = 0, ap = pop->array; i < mergelist_cnt; i++) { | |
270 | + memcpy(mergelist_parents[i]->u.mergelist, ap++, | |
271 | + sizeof (struct exclude_list_struct)); | |
272 | + } | |
d8af8661 WD |
273 | + |
274 | + free(pop->array); | |
275 | + free(pop); | |
7cb7ae4e WD |
276 | +} |
277 | + | |
a55d21aa | 278 | static int check_one_exclude(char *name, struct exclude_struct *ex, |
7cb7ae4e WD |
279 | int name_is_dir) |
280 | { | |
dc5cce3c | 281 | @@ -122,7 +299,7 @@ static int check_one_exclude(char *name, |
bc95f62b WD |
282 | /* If the pattern does not have any slashes AND it does not have |
283 | * a "**" (which could match a slash), then we just match the | |
284 | * name portion of the path. */ | |
285 | - if (!ex->slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) { | |
286 | + if (!ex->u.slash_cnt && !(ex->match_flags & MATCHFLG_WILD2)) { | |
287 | if ((p = strrchr(name,'/')) != NULL) | |
288 | name = p+1; | |
289 | } | |
dc5cce3c | 290 | @@ -148,9 +325,9 @@ static int check_one_exclude(char *name, |
bc95f62b WD |
291 | if (ex->match_flags & MATCHFLG_WILD) { |
292 | /* A non-anchored match with an infix slash and no "**" | |
293 | * needs to match the last slash_cnt+1 name elements. */ | |
0c7d1fd8 WD |
294 | - if (!match_start && ex->slash_cnt |
295 | + if (!match_start && ex->u.slash_cnt | |
296 | && !(ex->match_flags & MATCHFLG_WILD2)) { | |
bc95f62b WD |
297 | - int cnt = ex->slash_cnt + 1; |
298 | + int cnt = ex->u.slash_cnt + 1; | |
299 | for (p = name + strlen(name) - 1; p >= name; p--) { | |
300 | if (*p == '/' && !--cnt) | |
301 | break; | |
dc5cce3c | 302 | @@ -221,6 +398,13 @@ int check_exclude(struct exclude_list_st |
a55d21aa WD |
303 | struct exclude_struct *ent; |
304 | ||
305 | for (ent = listp->head; ent; ent = ent->next) { | |
524989ae | 306 | + if (ent->match_flags & MATCHFLG_MERGE_FILE) { |
eabda998 | 307 | + int rc = check_exclude(ent->u.mergelist, name, |
d8af8661 | 308 | + name_is_dir); |
a55d21aa WD |
309 | + if (rc) |
310 | + return rc; | |
311 | + continue; | |
312 | + } | |
313 | if (check_one_exclude(name, ent, name_is_dir)) { | |
314 | report_exclude_result(name, ent, name_is_dir, | |
315 | listp->debug_type); | |
dc5cce3c | 316 | @@ -253,11 +437,16 @@ static const char *get_exclude_tok(const |
a55d21aa WD |
317 | p = (const char *)s; |
318 | } | |
319 | ||
320 | - /* Is this a '+' or '-' followed by a space (not whitespace)? */ | |
321 | + /* Is this a +/-/. followed by a space (not whitespace)? */ | |
ee1af13c | 322 | if (!(xflags & XFLG_WORDS_ONLY) |
a55d21aa | 323 | - && (*s == '-' || *s == '+') && s[1] == ' ') { |
a55d21aa | 324 | + && (*s == '-' || *s == '+' || *s == '.') && s[1] == ' ') { |
0c7d1fd8 WD |
325 | if (*s == '+') |
326 | mflags |= MATCHFLG_INCLUDE; | |
a55d21aa | 327 | + else if (*s == '.') { |
524989ae | 328 | + mflags |= MATCHFLG_MERGE_FILE; |
a55d21aa WD |
329 | + if (xflags & XFLG_DEF_INCLUDE) |
330 | + mflags |= MATCHFLG_INCLUDE; | |
331 | + } | |
332 | s += 2; | |
0c7d1fd8 WD |
333 | } else if (xflags & XFLG_DEF_INCLUDE) |
334 | mflags |= MATCHFLG_INCLUDE; | |
c4e46f36 | 335 | @@ -306,11 +495,52 @@ void add_exclude(struct exclude_list_str |
0c7d1fd8 WD |
336 | continue; |
337 | } | |
a55d21aa | 338 | |
524989ae | 339 | + if (mflags & MATCHFLG_MERGE_FILE) { |
a55d21aa | 340 | + char name[MAXPATHLEN]; |
bc95f62b WD |
341 | + if (pat_len >= sizeof name) { |
342 | + rprintf(FERROR, | |
343 | + "merge filename too long: %s\n", cp); | |
344 | + continue; | |
345 | + } | |
a55d21aa | 346 | + strlcpy(name, cp, pat_len+1); |
524989ae | 347 | + if (strchr(name, '/') != NULL) { |
c4e46f36 WD |
348 | + char *mem = NULL; |
349 | + if (*name == '/') { | |
350 | + if (sanitize_paths) { | |
351 | + mem = alloc_sanitize_path(name, | |
352 | + curr_dir); | |
353 | + cp = mem; | |
354 | + } else | |
355 | + cp = name; | |
356 | + } else { | |
357 | + if (sanitize_paths) { | |
358 | + dirbuf[dirbuf_offset] = '\0'; | |
359 | + sanitize_path(name, dirbuf); | |
360 | + } | |
a55d21aa WD |
361 | + if (strlcpy(dirbuf + dirbuf_offset, |
362 | + name, MAXPATHLEN - dirbuf_offset) | |
bc95f62b WD |
363 | + >= MAXPATHLEN - dirbuf_offset) { |
364 | + rprintf(FERROR, | |
365 | + "merge filename too long: %s...\n", | |
366 | + dirbuf); | |
367 | + continue; | |
368 | + } | |
a55d21aa WD |
369 | + cp = dirbuf; |
370 | + } | |
371 | + add_exclude_file(listp, cp, | |
c4e46f36 WD |
372 | + xflags | XFLG_FATAL_ERRORS); |
373 | + if (mem) | |
374 | + free(mem); | |
a55d21aa | 375 | + continue; |
0c7d1fd8 WD |
376 | + } |
377 | + } | |
a55d21aa | 378 | + |
0c7d1fd8 WD |
379 | make_exclude(listp, cp, pat_len, mflags); |
380 | ||
381 | if (verbose > 2) { | |
382 | - rprintf(FINFO, "[%s] add_exclude(%.*s, %s%sclude)\n", | |
a55d21aa | 383 | + rprintf(FINFO, "[%s] add_exclude(%.*s, %s%s%sclude)\n", |
eabda998 | 384 | who_am_i(), (int)pat_len, cp, listp->debug_type, |
524989ae | 385 | + mflags & MATCHFLG_MERGE_FILE ? "FILE " : "", |
0c7d1fd8 | 386 | mflags & MATCHFLG_INCLUDE ? "in" : "ex"); |
a55d21aa | 387 | } |
0c7d1fd8 | 388 | } |
c4e46f36 WD |
389 | @@ -343,6 +573,11 @@ void add_exclude_file(struct exclude_lis |
390 | return; | |
391 | } | |
392 | ||
393 | + if (verbose > 2) { | |
394 | + rprintf(FINFO, "[%s] add_exclude_file(%s)\n", | |
395 | + who_am_i(), fname); | |
396 | + } | |
397 | + | |
398 | while (1) { | |
399 | char *s = line; | |
400 | int ch, overflow = 0; | |
401 | @@ -402,7 +637,11 @@ void send_exclude_list(int f) | |
0c7d1fd8 | 402 | if (ent->match_flags & MATCHFLG_INCLUDE) { |
a55d21aa WD |
403 | write_int(f, l + 2); |
404 | write_buf(f, "+ ", 2); | |
405 | - } else if ((*p == '-' || *p == '+') && p[1] == ' ') { | |
524989ae | 406 | + } else if (ent->match_flags & MATCHFLG_MERGE_FILE) { |
a55d21aa WD |
407 | + write_int(f, l + 2); |
408 | + write_buf(f, ". ", 2); | |
409 | + } else if ((*p == '-' || *p == '+' || *p == '.') | |
410 | + && p[1] == ' ') { | |
411 | write_int(f, l + 2); | |
412 | write_buf(f, "- ", 2); | |
413 | } else | |
c4e46f36 | 414 | @@ -443,6 +682,7 @@ void add_cvs_excludes(void) |
a55d21aa WD |
415 | char fname[MAXPATHLEN]; |
416 | char *p; | |
417 | ||
418 | + add_exclude(&exclude_list, ". .cvsignore", 0); | |
419 | add_exclude(&exclude_list, default_cvsignore, | |
ee1af13c | 420 | XFLG_WORD_SPLIT | XFLG_WORDS_ONLY); |
a55d21aa | 421 | |
eabda998 | 422 | --- flist.c 21 May 2004 23:22:14 -0000 1.225 |
c4e46f36 | 423 | +++ flist.c 24 May 2004 00:44:00 -0000 |
a55d21aa WD |
424 | @@ -39,8 +39,6 @@ extern int module_id; |
425 | extern int ignore_errors; | |
426 | extern int numeric_ids; | |
427 | ||
428 | -extern int cvs_exclude; | |
429 | - | |
430 | extern int recurse; | |
431 | extern char curr_dir[MAXPATHLEN]; | |
432 | extern char *files_from; | |
7cb7ae4e | 433 | @@ -65,7 +63,6 @@ extern int write_batch; |
a55d21aa WD |
434 | |
435 | extern struct exclude_list_struct exclude_list; | |
436 | extern struct exclude_list_struct server_exclude_list; | |
437 | -extern struct exclude_list_struct local_exclude_list; | |
438 | ||
439 | int io_error; | |
440 | ||
7cb7ae4e | 441 | @@ -210,8 +207,6 @@ int link_stat(const char *path, STRUCT_S |
a55d21aa WD |
442 | */ |
443 | static int check_exclude_file(char *fname, int is_dir, int exclude_level) | |
444 | { | |
445 | - int rc; | |
446 | - | |
447 | #if 0 /* This currently never happens, so avoid a useless compare. */ | |
448 | if (exclude_level == NO_EXCLUDES) | |
449 | return 0; | |
7cb7ae4e | 450 | @@ -233,10 +228,7 @@ static int check_exclude_file(char *fnam |
a55d21aa WD |
451 | if (exclude_level != ALL_EXCLUDES) |
452 | return 0; | |
453 | if (exclude_list.head | |
454 | - && (rc = check_exclude(&exclude_list, fname, is_dir)) != 0) | |
455 | - return rc < 0; | |
456 | - if (local_exclude_list.head | |
457 | - && check_exclude(&local_exclude_list, fname, is_dir) < 0) | |
458 | + && check_exclude(&exclude_list, fname, is_dir) < 0) | |
459 | return 1; | |
460 | return 0; | |
461 | } | |
eabda998 | 462 | @@ -942,15 +934,7 @@ void send_file_name(int f, struct file_l |
a55d21aa WD |
463 | |
464 | if (recursive && S_ISDIR(file->mode) | |
465 | && !(file->flags & FLAG_MOUNT_POINT)) { | |
466 | - struct exclude_list_struct last_list = local_exclude_list; | |
467 | - local_exclude_list.head = local_exclude_list.tail = NULL; | |
468 | send_directory(f, flist, f_name_to(file, fbuf)); | |
7cb7ae4e WD |
469 | - if (verbose > 2) { |
470 | - rprintf(FINFO, "[%s] popping %sexclude list\n", | |
471 | - who_am_i(), local_exclude_list.debug_type); | |
472 | - } | |
d8af8661 | 473 | - clear_exclude_list(&local_exclude_list); |
a55d21aa WD |
474 | - local_exclude_list = last_list; |
475 | } | |
476 | } | |
477 | ||
eabda998 | 478 | @@ -961,6 +945,7 @@ static void send_directory(int f, struct |
a55d21aa WD |
479 | struct dirent *di; |
480 | char fname[MAXPATHLEN]; | |
481 | unsigned int offset; | |
482 | + void *save_excludes; | |
483 | char *p; | |
484 | ||
485 | d = opendir(dir); | |
eabda998 | 486 | @@ -984,18 +969,7 @@ static void send_directory(int f, struct |
a55d21aa WD |
487 | offset++; |
488 | } | |
489 | ||
490 | - if (cvs_exclude) { | |
491 | - if (strlcpy(p, ".cvsignore", MAXPATHLEN - offset) | |
492 | - < MAXPATHLEN - offset) { | |
493 | - add_exclude_file(&local_exclude_list, fname, | |
ee1af13c | 494 | - XFLG_WORD_SPLIT | XFLG_WORDS_ONLY); |
a55d21aa WD |
495 | - } else { |
496 | - io_error |= IOERR_GENERAL; | |
497 | - rprintf(FINFO, | |
498 | - "cannot cvs-exclude in long-named directory %s\n", | |
499 | - full_fname(fname)); | |
500 | - } | |
501 | - } | |
502 | + save_excludes = push_local_excludes(fname, offset); | |
503 | ||
504 | for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) { | |
505 | char *dname = d_name(di); | |
eabda998 | 506 | @@ -1016,6 +990,8 @@ static void send_directory(int f, struct |
bc95f62b | 507 | rsyserr(FERROR, errno, "readdir(%s)", dir); |
a55d21aa | 508 | } |
a55d21aa | 509 | |
eabda998 WD |
510 | + pop_local_excludes(save_excludes); |
511 | + | |
a55d21aa WD |
512 | closedir(d); |
513 | } | |
eabda998 | 514 | |
0c7d1fd8 | 515 | --- rsync.h 16 May 2004 07:28:24 -0000 1.204 |
c4e46f36 | 516 | +++ rsync.h 24 May 2004 00:44:02 -0000 |
d8af8661 | 517 | @@ -496,11 +496,16 @@ struct map_struct { |
0c7d1fd8 WD |
518 | #define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */ |
519 | #define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */ | |
520 | #define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */ | |
524989ae | 521 | +#define MATCHFLG_MERGE_FILE (1<<7) /* specifies a file to merge */ |
a55d21aa WD |
522 | +#define MATCHFLG_CVSIGNORE (1<<8) /* parse this as a .cvsignore file */ |
523 | struct exclude_struct { | |
524 | struct exclude_struct *next; | |
525 | char *pattern; | |
0c7d1fd8 | 526 | unsigned int match_flags; |
bc95f62b | 527 | - int slash_cnt; |
bc95f62b WD |
528 | + union { |
529 | + int slash_cnt; | |
eabda998 | 530 | + struct exclude_list_struct *mergelist; |
bc95f62b | 531 | + } u; |
a55d21aa WD |
532 | }; |
533 | ||
534 | struct exclude_list_struct { | |
eabda998 | 535 | --- rsync.yo 21 May 2004 09:44:32 -0000 1.170 |
c4e46f36 | 536 | +++ rsync.yo 24 May 2004 00:44:02 -0000 |
dc5cce3c | 537 | @@ -1090,6 +1090,74 @@ itemize( |
524989ae WD |
538 | it would be excluded by the "*") |
539 | ) | |
540 | ||
541 | +manpagesection(MERGING EXCLUDE FILES) | |
542 | + | |
543 | +You can merge whole files into an exclude file using a rule that starts | |
544 | +with a ". " (a dot followed by a space) and has a filename in place of the | |
545 | +pattern. There are two types of merge rules, single-instance and | |
546 | +per-directory: | |
547 | + | |
548 | +itemize( | |
549 | + it() If the filename has no slashes in it, it is a per-directory merge; | |
bc95f62b | 550 | + rsync scans every directory that it traverses for the named file, merging |
dc5cce3c WD |
551 | + its contents (when it exists) at the start of this per-directory sub-list |
552 | + (subdirectories inherit the contents of their parent directories by | |
553 | + default, and each subdirectory's rules have precedence over the parent | |
554 | + directory's rules). When a per-directory merge file adds another | |
555 | + per-directory merge file, it is only active in the subtree of the current | |
556 | + directory. | |
524989ae WD |
557 | + |
558 | + it() If a filename has a slash in it, it is a single-instance merge; the | |
559 | + named file's contents will be merged into the current exclude file, | |
560 | + replacing the merge rule. Thus, you should use the name ./foo instead of | |
561 | + foo if you don't want to scan for "foo" in all the subdirectories of the | |
562 | + current directory. | |
563 | +) | |
564 | + | |
565 | +Note also that you can eliminate all the inherited rules for the current | |
566 | +per-directory ruleset by putting the list-clearing token (!) in the file. | |
bc95f62b WD |
567 | +This only clears the rules for the current per-directory sub-list (up |
568 | +through the ! token) and only for the current directory and its | |
524989ae WD |
569 | +subdirectories. |
570 | + | |
bc95f62b WD |
571 | +Here's an example exclude file (which you'd specify via the normal |
572 | +--exclude-from option): | |
524989ae WD |
573 | + |
574 | +verb( | |
575 | + . /home/user/.global_excludes | |
576 | + - *.gz | |
577 | + . .excl | |
578 | + + *.[ch] | |
579 | + - *.o | |
580 | +) | |
581 | + | |
582 | +This will merge the contents of the /home/user/.global_excludes file at the | |
583 | +start of the list and also turns the ".excl" filename into a per-directory | |
584 | +exclude file whose local contents will be merged into the list in place of | |
585 | +the .excl line. | |
586 | + | |
587 | +Additionally, you can affect where the --cvs-exclude (-C) option's | |
588 | +inclusion of a per-directory .cvsignore file gets placed into your rules by | |
bc95f62b | 589 | +adding an explicit merge rule for ".cvsignore". For instance, specifying |
524989ae WD |
590 | +this: |
591 | + | |
592 | +verb( | |
593 | + rsync -avC --exclude='. .cvsignore' --exclude-from=foo a/ b | |
594 | +) | |
595 | + | |
596 | +will merge all the per-directory .cvsignore rules at the start of your list | |
597 | +rather than at the end. This allows their dir-specific rules to supersede | |
598 | +your rules instead of being subservient to them. (The global rules taken | |
599 | +from the $HOME/.cvsignore file and from $CVSIGNORE are not affected by | |
600 | +this.) | |
601 | + | |
602 | +Note also that the parsing of any merge-file named ".cvsignore" is always | |
dc5cce3c WD |
603 | +done in a CVS-compatible manner, even if -C wasn't specified (i.e. the |
604 | +rules are always exclude rules (even when specified by an include option); | |
605 | +they are split on whitespace; no special prefixes, list-clearing tokens, or | |
606 | +comment characters are honored; and, for per-directory files, | |
607 | +subdirectories don't inherit the parent directory's rules). | |
524989ae WD |
608 | + |
609 | manpagesection(BATCH MODE) | |
610 | ||
611 | bf(Note:) Batch mode should be considered experimental in this version | |
c4e46f36 WD |
612 | --- testsuite/exclude.test 24 May 2004 00:16:07 -0000 1.8 |
613 | +++ testsuite/exclude.test 24 May 2004 00:44:02 -0000 | |
614 | @@ -23,19 +23,47 @@ export HOME CVSIGNORE | |
7d31425d WD |
615 | makepath "$fromdir/foo/down/to/you" |
616 | makepath "$fromdir/bar/down/to/foo/too" | |
617 | makepath "$fromdir/mid/for/foo/and/that/is/who" | |
c4e46f36 | 618 | +cat >"$fromdir/.excl" <<EOF |
7d31425d WD |
619 | +.excl |
620 | +*.bak | |
621 | +*.old | |
622 | +*.junk | |
c4e46f36 | 623 | +EOF |
7d31425d WD |
624 | echo kept >"$fromdir/foo/file1" |
625 | echo removed >"$fromdir/foo/file2" | |
626 | echo cvsout >"$fromdir/foo/file2.old" | |
c4e46f36 | 627 | +cat >"$fromdir/foo/.excl" <<EOF |
7d31425d WD |
628 | ++ .excl |
629 | +- file1 | |
c4e46f36 WD |
630 | +EOF |
631 | +cat >"$fromdir/bar/.excl" <<EOF | |
7d31425d WD |
632 | +home-cvs-exclude |
633 | +. .excl2 | |
634 | ++ to | |
c4e46f36 | 635 | +EOF |
7d31425d | 636 | echo cvsout >"$fromdir/bar/down/to/home-cvs-exclude" |
c4e46f36 | 637 | +cat >"$fromdir/bar/down/to/.excl2" <<EOF |
7d31425d | 638 | +.excl2 |
c4e46f36 | 639 | +EOF |
7d31425d WD |
640 | echo keeper >"$fromdir/bar/down/to/foo/file1" |
641 | echo cvsout >"$fromdir/bar/down/to/foo/file1.bak" | |
642 | echo gone >"$fromdir/bar/down/to/foo/file3" | |
643 | echo lost >"$fromdir/bar/down/to/foo/file4" | |
644 | echo cvsout >"$fromdir/bar/down/to/foo/file4.junk" | |
645 | echo smashed >"$fromdir/bar/down/to/foo/to" | |
c4e46f36 | 646 | +cat >"$fromdir/bar/down/to/foo/.excl2" <<EOF |
7d31425d | 647 | ++ *.junk |
c4e46f36 | 648 | +EOF |
7d31425d | 649 | +# This one should be ineffectual |
c4e46f36 | 650 | +cat >"$fromdir/mid/.excl2" <<EOF |
7d31425d | 651 | +extra |
c4e46f36 | 652 | +EOF |
7d31425d WD |
653 | echo cvsout >"$fromdir/mid/one-in-one-out" |
654 | echo one-in-one-out >"$fromdir/mid/.cvsignore" | |
655 | echo cvsin >"$fromdir/mid/one-for-all" | |
c4e46f36 | 656 | +cat >"$fromdir/mid/.excl" <<EOF |
7d31425d | 657 | +. .cvsignore |
c4e46f36 | 658 | +EOF |
7d31425d WD |
659 | echo cvsin >"$fromdir/mid/for/one-in-one-out" |
660 | echo expunged >"$fromdir/mid/for/foo/extra" | |
661 | echo retained >"$fromdir/mid/for/foo/keep" | |
c4e46f36 WD |
662 | @@ -100,5 +128,24 @@ $RSYNC -av --existing --include='*/' --e |
663 | checkit "$RSYNC -avvC --exclude-from=\"$excl\" \ | |
664 | --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" | |
7d31425d WD |
665 | |
666 | +# Modify the chk dir for our merge-exclude test and then tweak the dir times. | |
667 | + | |
668 | +rm "$chkdir"/.excl | |
669 | +rm "$chkdir"/foo/file1 | |
670 | +rm "$chkdir"/bar/.excl | |
671 | +rm "$chkdir"/bar/down/to/.excl2 | |
672 | +rm "$chkdir"/bar/down/to/foo/.excl2 | |
673 | +rm "$chkdir"/mid/.excl | |
674 | +cp -p "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo | |
675 | +cp -p "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo | |
676 | + | |
677 | +$RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/" | |
678 | + | |
679 | +# Now, test if rsync excludes the same files, this time with a merge-exclude | |
680 | +# file. | |
681 | + | |
c4e46f36 WD |
682 | +checkit "$RSYNC -avv --exclude='. .excl' --exclude-from=\"$excl\" \ |
683 | + --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" | |
7d31425d WD |
684 | + |
685 | # The script would have aborted on error, so getting here means we've won. | |
686 | exit 0 |