X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/cc3e685d09b2095099fc396157d19172ab3ef7c4..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/cvs-entries.diff

diff --git a/cvs-entries.diff b/cvs-entries.diff
index db45406..be52c61 100644
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -11,7 +11,7 @@ To use this patch, run these commands for a successful build:
 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,
+@@ -239,6 +239,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;
@@ -20,7 +20,7 @@ diff --git a/exclude.c b/exclude.c
  		if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
  			out_of_memory("add_rule");
  		ret->u.mergelist = lp;
-@@ -445,6 +447,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
+@@ -470,6 +472,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
  				set_filter_dir(dir, dirlen);
  		}
  
@@ -35,7 +35,7 @@ diff --git a/exclude.c b/exclude.c
  		if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
  		    MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) {
  			parse_filter_file(lp, dirbuf, ex->match_flags,
-@@ -1004,6 +1014,7 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
+@@ -1030,6 +1040,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;
@@ -43,7 +43,7 @@ diff --git a/exclude.c b/exclude.c
  
  	if (!fname || !*fname)
  		return;
-@@ -1050,6 +1061,24 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
+@@ -1076,6 +1087,24 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
  				}
  				break;
  			}
@@ -68,7 +68,7 @@ diff --git a/exclude.c b/exclude.c
  			if (word_split && isspace(ch))
  				break;
  			if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1059,13 +1088,15 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
+@@ -1085,13 +1114,15 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
  			else
  				overflow = 1;
  		}
@@ -88,11 +88,11 @@ diff --git a/exclude.c b/exclude.c
 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 XFLG_CVS_ENTRIES	(1<<4)
+@@ -151,6 +151,7 @@
+ #define XFLG_ANCHORED2ABS	(1<<2) /* leading slash indicates absolute */
+ #define XFLG_ABS_IF_SLASH	(1<<3) /* leading or interior slash is absolute */
+ #define XFLG_DIR2WILD3		(1<<4) /* dir/ match gets trailing *** added */
++#define XFLG_CVS_ENTRIES	(1<<5)
  
  #define ATTRS_REPORT		(1<<0)
  #define ATTRS_SKIP_MTIME	(1<<1)
@@ -155,9 +155,9 @@ diff --git a/testsuite/exclude.test b/testsuite/exclude.test
 +makepath "$chkdir/bar/down/to/CVS"
  rm "$chkdir"/foo/file1
  rm "$chkdir"/bar/down/to/bar/baz/*.deep
-+cp -p "$fromdir"/bar/down/to/D "$chkdir"/bar/down/to/D
-+cp -p "$fromdir"/bar/down/to/not.good "$chkdir"/bar/down/to/not.good
-+cp -p "$fromdir"/bar/down/to/CVS/Entries "$chkdir"/bar/down/to/CVS/Entries
- cp -p "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
- cp -p "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo
++cp_touch "$fromdir"/bar/down/to/D "$chkdir"/bar/down/to/D
++cp_touch "$fromdir"/bar/down/to/not.good "$chkdir"/bar/down/to/not.good
++cp_touch "$fromdir"/bar/down/to/CVS/Entries "$chkdir"/bar/down/to/CVS/Entries
+ cp_touch "$fromdir"/bar/down/to/foo/*.junk "$chkdir"/bar/down/to/foo
+ cp_touch "$fromdir"/bar/down/to/foo/to "$chkdir"/bar/down/to/foo