./configure (optional if already run)
make
---- old/exclude.c
-+++ new/exclude.c
-@@ -217,6 +217,8 @@ static void add_rule(struct filter_list_
+diff --git a/exclude.c b/exclude.c
+--- a/exclude.c
++++ b/exclude.c
+@@ -213,6 +213,8 @@ static void add_rule(struct filter_list_struct *listp, const char *pat,
if (!(lp = new_array(struct filter_list_struct, 1)))
out_of_memory("add_rule");
lp->head = lp->tail = NULL;
if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
out_of_memory("add_rule");
ret->u.mergelist = lp;
-@@ -449,6 +451,14 @@ void *push_local_filters(const char *dir
+@@ -445,6 +447,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
set_filter_dir(dir, dirlen);
}
if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) {
parse_filter_file(lp, dirbuf, ex->match_flags,
-@@ -1005,6 +1015,7 @@ void parse_filter_file(struct filter_lis
+@@ -1004,6 +1014,7 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
char line[BIGPATHBUFLEN];
char *eob = line + sizeof line - 1;
int word_split = mflags & MATCHFLG_WORD_SPLIT;
if (!fname || !*fname)
return;
-@@ -1051,6 +1062,24 @@ void parse_filter_file(struct filter_lis
+@@ -1050,6 +1061,24 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
}
break;
}
if (word_split && isspace(ch))
break;
if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1060,13 +1089,15 @@ void parse_filter_file(struct filter_lis
+@@ -1059,13 +1088,15 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
else
overflow = 1;
}
parse_rule(listp, line, mflags, xflags);
if (ch == EOF)
break;
---- old/rsync.h
-+++ new/rsync.h
-@@ -132,6 +132,7 @@
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -145,6 +145,7 @@
#define XFLG_OLD_PREFIXES (1<<1)
#define XFLG_ANCHORED2ABS (1<<2)
#define XFLG_ABS_IF_SLASH (1<<3)
#define ATTRS_REPORT (1<<0)
#define ATTRS_SKIP_MTIME (1<<1)
---- old/testsuite/exclude.test
-+++ new/testsuite/exclude.test
+diff --git a/testsuite/exclude.test b/testsuite/exclude.test
+--- a/testsuite/exclude.test
++++ b/testsuite/exclude.test
@@ -19,6 +19,7 @@ export CVSIGNORE
makepath "$fromdir/foo/down/to/you"
makepath "$fromdir/bar/down/to/foo/too"
makepath "$fromdir/bar/down/to/bar/baz"
makepath "$fromdir/mid/for/foo/and/that/is/who"
-@@ -57,6 +58,9 @@ echo cvsout >"$fromdir/bar/down/to/foo/f
+@@ -57,6 +58,9 @@ 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 weird >"$fromdir/bar/down/to/foo/+ file3"
echo cvsout-but-filtin >"$fromdir/bar/down/to/foo/file4.junk"
echo smashed >"$fromdir/bar/down/to/foo/to"
cat >"$fromdir/bar/down/to/bar/.filt2" <<EOF
-@@ -103,7 +107,18 @@ cat >"$excl" <<EOF
+@@ -102,7 +106,18 @@ cat >"$excl" <<EOF
EOF
cat >"$scratchdir/.cvsignore" <<EOF
+not.good
EOF
- # Create the chk dir with what we expect to be excluded
-@@ -132,6 +147,10 @@ checkit "$RSYNC -avv --exclude-from=\"$e
+ # Start with a check of --prune-empty-dirs:
+@@ -136,6 +151,10 @@ checkit "$RSYNC -avv --exclude-from='$excl' \
# Modify the chk dir by removing cvs-ignored files and then tweaking the dir times.
rm "$chkdir"/foo/*.old
rm "$chkdir"/bar/down/to/foo/*.bak
rm "$chkdir"/bar/down/to/foo/*.junk
rm "$chkdir"/bar/down/to/home-cvs-exclude
-@@ -147,8 +166,12 @@ checkit "$RSYNC -avvC --filter=\"merge $
+@@ -151,8 +170,12 @@ checkit "$RSYNC -avvC --filter='merge $excl' --delete-excluded \
# Modify the chk dir for our merge-exclude test and then tweak the dir times.