X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9a7eef964a2e3389ffd3537302f80ca42cfe9239..e2b0842aedc76f71ce67a901d5d3fa95058efcc9:/cvs-entries.diff

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 33def78..e61a34e 100644
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -2,9 +2,15 @@ This patch causes the --cvs-exclude option to prefix the names listed
 in each dir's CVS/Entries file as per-dir includes before the dir's list
 of excludes taken from the .cvsignore file.
 
+To use this patch, run these commands for a successful build:
+
+    patch -p1 <patches/cvs-entries.diff
+    ./configure                                 (optional if already run)
+    make
+
 --- old/exclude.c
 +++ new/exclude.c
-@@ -221,6 +221,8 @@ static void add_rule(struct filter_list_
+@@ -217,6 +217,8 @@ static void add_rule(struct filter_list_
  		if (!(lp = new_array(struct filter_list_struct, 1)))
  			out_of_memory("add_rule");
  		lp->head = lp->tail = NULL;
@@ -13,7 +19,7 @@ of excludes taken from the .cvsignore file.
  		if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
  			out_of_memory("add_rule");
  		ret->u.mergelist = lp;
-@@ -454,6 +456,14 @@ void *push_local_filters(const char *dir
+@@ -449,6 +451,14 @@ void *push_local_filters(const char *dir
  				set_filter_dir(dir, dirlen);
  		}
  
@@ -28,7 +34,7 @@ of excludes taken from the .cvsignore file.
  		if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
  		    MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) {
  			parse_filter_file(lp, dirbuf, ex->match_flags,
-@@ -970,6 +980,7 @@ void parse_filter_file(struct filter_lis
+@@ -1005,6 +1015,7 @@ void parse_filter_file(struct filter_lis
  	char line[BIGPATHBUFLEN];
  	char *eob = line + sizeof line - 1;
  	int word_split = mflags & MATCHFLG_WORD_SPLIT;
@@ -36,7 +42,7 @@ of excludes taken from the .cvsignore file.
  
  	if (!fname || !*fname)
  		return;
-@@ -1016,6 +1027,24 @@ void parse_filter_file(struct filter_lis
+@@ -1051,6 +1062,24 @@ void parse_filter_file(struct filter_lis
  				}
  				break;
  			}
@@ -61,7 +67,7 @@ of excludes taken from the .cvsignore file.
  			if (word_split && isspace(ch))
  				break;
  			if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1025,13 +1054,15 @@ void parse_filter_file(struct filter_lis
+@@ -1060,13 +1089,15 @@ void parse_filter_file(struct filter_lis
  			else
  				overflow = 1;
  		}
@@ -80,7 +86,7 @@ of excludes taken from the .cvsignore file.
  			break;
 --- old/rsync.h
 +++ new/rsync.h
-@@ -116,6 +116,7 @@
+@@ -132,6 +132,7 @@
  #define XFLG_OLD_PREFIXES	(1<<1)
  #define XFLG_ANCHORED2ABS	(1<<2)
  #define XFLG_ABS_IF_SLASH	(1<<3)