using a ". FILE" idiom. If you specify a name without slashes, that
filename will be looked for in every subdirectory that rsync visits,
and the rules found in that subdirectory's file will affect that dir
-and its subdirectories.
+and (optionally) its subdirectories.
For example:
- rsync -av --exclude='. .excl' from/ to
+ rsync -av --exclude='. .excl' --inherit=. from/ to
The above will look for a file named ".excl" in every directory of the
hierarchy that rsync visits, and it will exclude (by default) names
*.o
Then the file ".excl2" will also be read in the current dir, and all
-subdirs of the current dir. The file ".excl3" would just be read in
-for the current dir because its name contained a slash.
+subdirs of the current dir (due to the --inherit option). The file
+".excl3" would just be read in for the current dir because its name
+contained a slash.
..wayne..
---- exclude.c 22 May 2004 05:32:20 -0000 1.82
-+++ exclude.c 22 May 2004 19:32:12 -0000
-@@ -30,13 +30,56 @@ extern int verbose;
+--- orig/exclude.c 2004-05-22 19:30:03
++++ exclude.c 2004-07-03 20:21:27
+@@ -30,13 +30,59 @@ extern int verbose;
extern int eol_nulls;
extern int list_only;
extern int recurse;
+extern int io_error;
++extern int module_id;
++extern int inherit_exclude_levels;
+extern int sanitize_paths;
extern char curr_dir[];
++extern unsigned int curr_dir_len;
struct exclude_list_struct exclude_list = { 0, 0, "" };
-struct exclude_list_struct local_exclude_list = { 0, 0, "per-dir .cvsignore " };
/** Build an exclude structure given an exclude pattern. */
static void make_exclude(struct exclude_list_struct *listp, const char *pat,
-@@ -46,6 +89,24 @@ static void make_exclude(struct exclude_
+@@ -46,6 +92,24 @@ static void make_exclude(struct exclude_
const char *cp;
unsigned int ex_len;
ret = new(struct exclude_struct);
if (!ret)
out_of_memory("make_exclude");
-@@ -81,14 +142,36 @@ static void make_exclude(struct exclude_
+@@ -81,14 +145,36 @@ static void make_exclude(struct exclude_
mflags |= MATCHFLG_DIRECTORY;
}
listp->tail->next = ret;
listp->tail = ret;
}
-@@ -96,22 +179,116 @@ static void make_exclude(struct exclude_
+@@ -96,22 +182,150 @@ static void make_exclude(struct exclude_
static void free_exclude(struct exclude_struct *ex)
{
listp->head = listp->tail = NULL;
}
++void pre_inherit_files(char *fname, unsigned int len)
++{
++ char path[MAXPATHLEN], save[MAXPATHLEN];
++ unsigned int limit;
++ int i;
++
++ if (sanitize_paths)
++ limit = strlen(lp_path(module_id));
++ else
++ limit = 0;
++ fname[len] = '\0';
++ if (*fname == '/')
++ strcpy(path, fname);
++ else
++ len = pathjoin(path, sizeof path, curr_dir, fname);
++
++ if (len >= MAXPATHLEN || len == 0)
++ return;
++
++ for (i = inherit_exclude_levels, len--; i && len > limit; ) {
++ if (path[--len] == '/')
++ i--;
++ }
++ for (len++; i < inherit_exclude_levels; i++) {
++ char *s = path + len;
++ strcpy(save, s);
++ push_local_excludes(path, len);
++ strcpy(s, save);
++ if (!(s = strchr(s, '/')))
++ break; /* Impossible ... */
++ len = s - path + 1;
++ }
++}
++
+void *push_local_excludes(char *fname, unsigned int offset)
+{
+ struct mergelist_save_struct *push;
static int check_one_exclude(char *name, struct exclude_struct *ex,
int name_is_dir)
{
-@@ -122,7 +299,7 @@ static int check_one_exclude(char *name,
+@@ -122,7 +336,7 @@ static int check_one_exclude(char *name,
/* If the pattern does not have any slashes AND it does not have
* a "**" (which could match a slash), then we just match the
* name portion of the path. */
if ((p = strrchr(name,'/')) != NULL)
name = p+1;
}
-@@ -148,9 +325,9 @@ static int check_one_exclude(char *name,
+@@ -148,9 +362,9 @@ static int check_one_exclude(char *name,
if (ex->match_flags & MATCHFLG_WILD) {
/* A non-anchored match with an infix slash and no "**"
* needs to match the last slash_cnt+1 name elements. */
for (p = name + strlen(name) - 1; p >= name; p--) {
if (*p == '/' && !--cnt)
break;
-@@ -221,6 +398,13 @@ int check_exclude(struct exclude_list_st
+@@ -221,6 +435,13 @@ int check_exclude(struct exclude_list_st
struct exclude_struct *ent;
for (ent = listp->head; ent; ent = ent->next) {
if (check_one_exclude(name, ent, name_is_dir)) {
report_exclude_result(name, ent, name_is_dir,
listp->debug_type);
-@@ -253,11 +437,16 @@ static const char *get_exclude_tok(const
+@@ -253,11 +474,16 @@ static const char *get_exclude_tok(const
p = (const char *)s;
}
s += 2;
} else if (xflags & XFLG_DEF_INCLUDE)
mflags |= MATCHFLG_INCLUDE;
-@@ -306,11 +495,42 @@ void add_exclude(struct exclude_list_str
+@@ -306,11 +532,54 @@ void add_exclude(struct exclude_list_str
continue;
}
+ continue;
+ }
+ strlcpy(name, cp, pat_len+1);
-+ if (strchr(name, '/') != NULL) {
-+ if (sanitize_paths)
-+ sanitize_path(name, curr_dir);
-+ if (*name == '/')
-+ cp = name;
-+ else {
++ if (!(xflags & XFLG_PERDIR_MERGE)
++ && (inherit_exclude_levels == -1
++ || strchr(name, '/') != NULL)) {
++ char *mem = NULL;
++ if (*name == '/') {
++ if (sanitize_paths) {
++ mem = alloc_sanitize_path(name,
++ curr_dir);
++ cp = mem;
++ } else
++ cp = name;
++ } else {
++ if (sanitize_paths) {
++ dirbuf[dirbuf_offset] = '\0';
++ sanitize_path(name, dirbuf);
++ }
+ if (strlcpy(dirbuf + dirbuf_offset,
+ name, MAXPATHLEN - dirbuf_offset)
+ >= MAXPATHLEN - dirbuf_offset) {
+ cp = dirbuf;
+ }
+ add_exclude_file(listp, cp,
-+ xflags | XFLG_FATAL_ERRORS);
++ xflags | XFLG_FATAL_ERRORS);
++ if (mem)
++ free(mem);
+ continue;
+ }
+ }
mflags & MATCHFLG_INCLUDE ? "in" : "ex");
}
}
-@@ -402,7 +622,11 @@ void send_exclude_list(int f)
+@@ -343,6 +612,11 @@ void add_exclude_file(struct exclude_lis
+ return;
+ }
+
++ if (verbose > 2) {
++ rprintf(FINFO, "[%s] add_exclude_file(%s,%d)\n",
++ who_am_i(), fname, xflags);
++ }
++
+ while (1) {
+ char *s = line;
+ int ch, overflow = 0;
+@@ -402,7 +676,11 @@ void send_exclude_list(int f)
if (ent->match_flags & MATCHFLG_INCLUDE) {
write_int(f, l + 2);
write_buf(f, "+ ", 2);
write_int(f, l + 2);
write_buf(f, "- ", 2);
} else
-@@ -443,6 +667,7 @@ void add_cvs_excludes(void)
+@@ -443,6 +721,7 @@ void add_cvs_excludes(void)
char fname[MAXPATHLEN];
char *p;
-+ add_exclude(&exclude_list, ". .cvsignore", 0);
++ add_exclude(&exclude_list, ". .cvsignore", XFLG_PERDIR_MERGE);
add_exclude(&exclude_list, default_cvsignore,
XFLG_WORD_SPLIT | XFLG_WORDS_ONLY);
---- flist.c 21 May 2004 23:22:14 -0000 1.225
-+++ flist.c 22 May 2004 19:32:12 -0000
+--- orig/flist.c 2004-07-15 02:21:10
++++ flist.c 2004-07-03 20:21:27
@@ -39,8 +39,6 @@ extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
extern char curr_dir[MAXPATHLEN];
extern char *files_from;
-@@ -65,7 +63,6 @@ extern int write_batch;
+@@ -59,6 +57,7 @@ extern int implied_dirs;
+ extern int copy_links;
+ extern int copy_unsafe_links;
+ extern int protocol_version;
++extern int inherit_exclude_levels;
+ extern int sanitize_paths;
+ extern int delete_excluded;
+ extern int orig_umask;
+@@ -66,7 +65,6 @@ extern int list_only;
extern struct exclude_list_struct exclude_list;
extern struct exclude_list_struct server_exclude_list;
int io_error;
-@@ -210,8 +207,6 @@ int link_stat(const char *path, STRUCT_S
+@@ -221,8 +219,6 @@ int link_stat(const char *path, STRUCT_S
*/
static int check_exclude_file(char *fname, int is_dir, int exclude_level)
{
#if 0 /* This currently never happens, so avoid a useless compare. */
if (exclude_level == NO_EXCLUDES)
return 0;
-@@ -233,10 +228,7 @@ static int check_exclude_file(char *fnam
+@@ -244,10 +240,7 @@ static int check_exclude_file(char *fnam
if (exclude_level != ALL_EXCLUDES)
return 0;
if (exclude_list.head
return 1;
return 0;
}
-@@ -942,15 +934,7 @@ void send_file_name(int f, struct file_l
+@@ -954,15 +947,7 @@ void send_file_name(int f, struct file_l
if (recursive && S_ISDIR(file->mode)
&& !(file->flags & FLAG_MOUNT_POINT)) {
}
}
-@@ -961,6 +945,7 @@ static void send_directory(int f, struct
+@@ -973,6 +958,7 @@ static void send_directory(int f, struct
struct dirent *di;
char fname[MAXPATHLEN];
unsigned int offset;
char *p;
d = opendir(dir);
-@@ -984,18 +969,7 @@ static void send_directory(int f, struct
+@@ -996,19 +982,13 @@ static void send_directory(int f, struct
offset++;
}
- "cannot cvs-exclude in long-named directory %s\n",
- full_fname(fname));
- }
-- }
-+ save_excludes = push_local_excludes(fname, offset);
++ if (inherit_exclude_levels > 0) {
++ pre_inherit_files(fname, offset);
++ inherit_exclude_levels = 0;
+ }
++ save_excludes = push_local_excludes(fname, offset);
++
for (errno = 0, di = readdir(d); di; errno = 0, di = readdir(d)) {
char *dname = d_name(di);
-@@ -1016,6 +990,8 @@ static void send_directory(int f, struct
+ if (dname[0] == '.' && (dname[1] == '\0'
+@@ -1028,6 +1008,8 @@ static void send_directory(int f, struct
rsyserr(FERROR, errno, "readdir(%s)", dir);
}
closedir(d);
}
---- rsync.h 16 May 2004 07:28:24 -0000 1.204
-+++ rsync.h 22 May 2004 19:32:13 -0000
-@@ -496,11 +496,16 @@ struct map_struct {
+--- orig/options.c 2004-07-15 16:51:50
++++ options.c 2004-07-03 20:21:27
+@@ -50,6 +50,7 @@ int preserve_gid = 0;
+ int preserve_times = 0;
+ int update_only = 0;
+ int cvs_exclude = 0;
++int inherit_exclude_levels = -9999;
+ int dry_run = 0;
+ int local_server = 0;
+ int ignore_times = 0;
+@@ -308,7 +309,7 @@ void usage(enum logcode F)
+
+ enum {OPT_VERSION = 1000, OPT_SENDER, OPT_EXCLUDE, OPT_EXCLUDE_FROM,
+ OPT_DELETE_AFTER, OPT_DELETE_EXCLUDED, OPT_LINK_DEST,
+- OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_MODIFY_WINDOW,
++ OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_INHERIT, OPT_MODIFY_WINDOW,
+ OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_TIMEOUT,
+ OPT_REFUSED_BASE = 9000};
+
+@@ -333,6 +334,7 @@ static struct poptOption long_options[]
+ {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
+ {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
+ {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
++ {"inherit", 0, POPT_ARG_STRING, 0, OPT_INHERIT, 0, 0 },
+ {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks, 0, 0, 0 },
+ {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
+ {"backup", 'b', POPT_ARG_NONE, &make_backups, 0, 0, 0 },
+@@ -541,6 +543,31 @@ int parse_arguments(int *argc, const cha
+ XFLG_FATAL_ERRORS | XFLG_DEF_INCLUDE);
+ break;
+
++ case OPT_INHERIT:
++ arg = poptGetOptArg(pc);
++ if (isdigit(*arg))
++ inherit_exclude_levels = atoi(arg);
++ else if (*arg == '.') {
++ if (!arg[1])
++ inherit_exclude_levels = 0;
++ else if (arg[1] == '.') {
++ inherit_exclude_levels = 0;
++ arg--;
++ do {
++ inherit_exclude_levels++;
++ arg += 3;
++ } while (strncmp(arg, "/..", 3) == 0);
++ if (*arg)
++ inherit_exclude_levels = -1;
++ }
++ }
++ if (inherit_exclude_levels < 0) {
++ snprintf(err_buf, sizeof err_buf,
++ "Invalid argument given to --inherit.\n");
++ return 0;
++ }
++ break;
++
+ case 'h':
+ usage(FINFO);
+ exit_cleanup(0);
+@@ -770,6 +797,9 @@ int parse_arguments(int *argc, const cha
+ }
+ }
+
++ if (inherit_exclude_levels < 0)
++ inherit_exclude_levels = -1;
++
+ return 1;
+ }
+
+@@ -871,6 +901,12 @@ void server_options(char **args,int *arg
+ if (x != 1)
+ args[ac++] = argstr;
+
++ if (inherit_exclude_levels >= 0) {
++ if (asprintf(&arg, "--inherit=%d", inherit_exclude_levels) < 0)
++ goto oom;
++ args[ac++] = arg;
++ }
++
+ if (block_size) {
+ if (asprintf(&arg, "-B%u", block_size) < 0)
+ goto oom;
+--- orig/rsync.h 2004-07-07 08:27:00
++++ rsync.h 2004-07-03 20:21:27
+@@ -108,6 +108,7 @@
+ #define XFLG_DEF_INCLUDE (1<<1)
+ #define XFLG_WORDS_ONLY (1<<2)
+ #define XFLG_WORD_SPLIT (1<<3)
++#define XFLG_PERDIR_MERGE (1<<4)
+
+ #define PERMS_REPORT (1<<0)
+ #define PERMS_SKIP_MTIME (1<<1)
+@@ -496,11 +497,16 @@ struct map_struct {
#define MATCHFLG_INCLUDE (1<<4) /* this is an include, not an exclude */
#define MATCHFLG_DIRECTORY (1<<5) /* this matches only directories */
#define MATCHFLG_CLEAR_LIST (1<<6) /* this item is the "!" token */
};
struct exclude_list_struct {
---- rsync.yo 21 May 2004 09:44:32 -0000 1.170
-+++ rsync.yo 22 May 2004 19:32:13 -0000
-@@ -1090,6 +1090,74 @@ itemize(
+--- orig/rsync.yo 2004-07-15 02:21:11
++++ rsync.yo 2004-07-03 20:21:27
+@@ -332,6 +332,7 @@ verb(
+ --exclude-from=FILE exclude patterns listed in FILE
+ --include=PATTERN don't exclude files matching PATTERN
+ --include-from=FILE don't exclude patterns listed in FILE
++ --inherit=DEPTH make per-dir merge files inherited
+ --files-from=FILE read FILE for list of source-file names
+ -0 --from0 all file lists are delimited by nulls
+ --version print version number
+@@ -688,6 +689,28 @@ dit(bf(--include-from=FILE)) This specif
+ from a file.
+ If em(FILE) is bf(-) the list will be read from standard input.
+
++dit(bf(--inherit=DEPTH)) Using this option allows you to specify that the
++contents of per-directory merge files is inherited by the subdirectories of
++the spot where the rules were read in. If a subdirectory has its own
++per-directory merge file, its contents are prefixed to the inherited rules,
++which gives them higher priority.
++
++The DEPTH value tells rsync how much deeper than the root directory of the
++transfer should be scanned for merge files. If you don't need any higher
++directories scanned, use "." (dot). If you want the parent directory
++scanned, specify ".." (dot dot) or "1" (i.e. one directory higher). You
++can continue to specify either more ".."s (separated by slashes) or simply
++supply the count of how many parent-directory levels should be scanned.
++The reason this is useful is that you may wish to transfer just a small
++portion of a larger tree of files, but to be sure to get all the
++appropriate exclude rules, you need to be sure that rsync reads in all the
++merge files from the top of the tree of related files.
++
++Note also that you can eliminate all the inherited rules for the current
++per-directory ruleset by putting the list-clearing token (!) in the file.
++This only clears the rules in the current per-directory sub-list for the
++current directory and its subdirectories.
++
+ dit(bf(--files-from=FILE)) Using this option allows you to specify the
+ exact list of files to transfer (as read from the specified FILE or "-"
+ for stdin). It also tweaks the default behavior of rsync to make
+@@ -1039,6 +1062,11 @@ itemize(
+ then it is always considered an exclude pattern, even if specified as
+ part of an include option. The prefix is discarded before matching.
+
++ it() if the pattern starts with ". " (a dot followed by a space) then it
++ its pattern is taken to be a merge file that is read in to supplement the
++ current rules. See the section on MERGING EXCLUDE FILES for more
++ information.
++
+ it() if the pattern is a single exclamation mark ! then the current
+ include/exclude list is reset, removing all previously defined patterns.
+ )
+@@ -1091,6 +1119,67 @@ itemize(
it would be excluded by the "*")
)
+itemize(
+ it() If the filename has no slashes in it, it is a per-directory merge;
+ rsync scans every directory that it traverses for the named file, merging
-+ its contents (when it exists) at the start of this per-directory sub-list
-+ (subdirectories inherit the contents of their parent directories by
-+ default, and each subdirectory's rules have precedence over the parent
-+ directory's rules). When a per-directory merge file adds another
-+ per-directory merge file, it is only active in the subtree of the current
-+ directory.
++ its contents (when it exists) at the start of this per-directory
++ sub-list.
+
+ it() If a filename has a slash in it, it is a single-instance merge; the
+ named file's contents will be merged into the current exclude file,
+ replacing the merge rule. Thus, you should use the name ./foo instead of
-+ foo if you don't want to scan for "foo" in all the subdirectories of the
-+ current directory.
++ foo if you don't want to scan for "foo" in all the subdirectories in the
++ transferred tree of directories.
+)
+
-+Note also that you can eliminate all the inherited rules for the current
-+per-directory ruleset by putting the list-clearing token (!) in the file.
-+This only clears the rules for the current per-directory sub-list (up
-+through the ! token) and only for the current directory and its
-+subdirectories.
-+
+Here's an example exclude file (which you'd specify via the normal
+--exclude-from option):
+
+Note also that the parsing of any merge-file named ".cvsignore" is always
+done in a CVS-compatible manner, even if -C wasn't specified (i.e. the
+rules are always exclude rules (even when specified by an include option);
-+they are split on whitespace; no special prefixes, list-clearing tokens, or
-+comment characters are honored; and, for per-directory files,
-+subdirectories don't inherit the parent directory's rules).
++they are split on whitespace; and no special prefixes, list-clearing
++tokens, or comment characters are honored).
++
++See the --inherit option for how to make the rules read from a
++per-directory merge file inherited by all the subdirectories of the
++spot where the per-directory rule file was found.
+
manpagesection(BATCH MODE)
bf(Note:) Batch mode should be considered experimental in this version
---- testsuite/exclude.test 22 May 2004 19:29:53 -0000 1.7
-+++ testsuite/exclude.test 22 May 2004 19:32:13 -0000
-@@ -24,19 +24,47 @@ echo home-cvs-exclude >"$scratchdir"/.cv
+--- orig/testsuite/exclude.test 2004-05-29 21:25:45
++++ testsuite/exclude.test 2004-07-03 20:21:27
+@@ -23,19 +23,47 @@ export HOME CVSIGNORE
makepath "$fromdir/foo/down/to/you"
makepath "$fromdir/bar/down/to/foo/too"
makepath "$fromdir/mid/for/foo/and/that/is/who"
-+cat <<EOT >"$fromdir/.excl"
++cat >"$fromdir/.excl" <<EOF
+.excl
+*.bak
+*.old
+*.junk
-+EOT
++EOF
echo kept >"$fromdir/foo/file1"
echo removed >"$fromdir/foo/file2"
echo cvsout >"$fromdir/foo/file2.old"
-+cat <<EOT >"$fromdir/foo/.excl"
++cat >"$fromdir/foo/.excl" <<EOF
++ .excl
+- file1
-+EOT
-+cat <<EOT >"$fromdir/bar/.excl"
++EOF
++cat >"$fromdir/bar/.excl" <<EOF
+home-cvs-exclude
+. .excl2
++ to
-+EOT
++EOF
echo cvsout >"$fromdir/bar/down/to/home-cvs-exclude"
-+cat <<EOT >"$fromdir/bar/down/to/.excl2"
++cat >"$fromdir/bar/down/to/.excl2" <<EOF
+.excl2
-+EOT
++EOF
echo keeper >"$fromdir/bar/down/to/foo/file1"
echo cvsout >"$fromdir/bar/down/to/foo/file1.bak"
echo gone >"$fromdir/bar/down/to/foo/file3"
echo lost >"$fromdir/bar/down/to/foo/file4"
echo cvsout >"$fromdir/bar/down/to/foo/file4.junk"
echo smashed >"$fromdir/bar/down/to/foo/to"
-+cat <<EOT >"$fromdir/bar/down/to/foo/.excl2"
++cat >"$fromdir/bar/down/to/foo/.excl2" <<EOF
++ *.junk
-+EOT
++EOF
+# This one should be ineffectual
-+cat <<EOT >"$fromdir/mid/.excl2"
++cat >"$fromdir/mid/.excl2" <<EOF
+extra
-+EOT
++EOF
echo cvsout >"$fromdir/mid/one-in-one-out"
echo one-in-one-out >"$fromdir/mid/.cvsignore"
echo cvsin >"$fromdir/mid/one-for-all"
-+cat <<EOT >"$fromdir/mid/.excl"
++cat >"$fromdir/mid/.excl" <<EOF
+. .cvsignore
-+EOT
++EOF
echo cvsin >"$fromdir/mid/for/one-in-one-out"
echo expunged >"$fromdir/mid/for/foo/extra"
echo retained >"$fromdir/mid/for/foo/keep"
-@@ -97,5 +125,24 @@ $RSYNC -av --existing --include='*/' --e
- checkit "$RSYNC -avvC --delete-excluded --exclude-from=$excl \
- \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+@@ -100,5 +128,24 @@ $RSYNC -av --existing --include='*/' --e
+ checkit "$RSYNC -avvC --exclude-from=\"$excl\" \
+ --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+# Modify the chk dir for our merge-exclude test and then tweak the dir times.
+
+# Now, test if rsync excludes the same files, this time with a merge-exclude
+# file.
+
-+checkit "$RSYNC -avv --exclude='. .excl' --delete-excluded --exclude-from=$excl \
-+ \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
++checkit "$RSYNC -avv --exclude='. .excl' --exclude-from=\"$excl\" --inherit=. \
++ --delete-excluded \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+
# The script would have aborted on error, so getting here means we've won.
exit 0
git.samba.org / rsync-patches.git / blobdiff