X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..e9d4ab8849c465e766a494765b29e26564f284d0:/cvs-entries.diff

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 3052025..e61a34e 100644
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -10,7 +10,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/exclude.c
 +++ new/exclude.c
-@@ -216,6 +216,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;
@@ -19,7 +19,7 @@ To use this patch, run these commands for a successful build:
  		if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
  			out_of_memory("add_rule");
  		ret->u.mergelist = lp;
-@@ -448,6 +450,14 @@ void *push_local_filters(const char *dir
+@@ -449,6 +451,14 @@ void *push_local_filters(const char *dir
  				set_filter_dir(dir, dirlen);
  		}
  
@@ -34,7 +34,7 @@ To use this patch, run these commands for a successful build:
  		if (strlcpy(dirbuf + dirbuf_len, ex->pattern,
  		    MAXPATHLEN - dirbuf_len) < MAXPATHLEN - dirbuf_len) {
  			parse_filter_file(lp, dirbuf, ex->match_flags,
-@@ -973,6 +983,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;
@@ -42,7 +42,7 @@ To use this patch, run these commands for a successful build:
  
  	if (!fname || !*fname)
  		return;
-@@ -1019,6 +1030,24 @@ void parse_filter_file(struct filter_lis
+@@ -1051,6 +1062,24 @@ void parse_filter_file(struct filter_lis
  				}
  				break;
  			}
@@ -67,7 +67,7 @@ To use this patch, run these commands for a successful build:
  			if (word_split && isspace(ch))
  				break;
  			if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1028,13 +1057,15 @@ void parse_filter_file(struct filter_lis
+@@ -1060,13 +1089,15 @@ void parse_filter_file(struct filter_lis
  			else
  				overflow = 1;
  		}
@@ -86,7 +86,7 @@ To use this patch, run these commands for a successful build:
  			break;
 --- old/rsync.h
 +++ new/rsync.h
-@@ -117,6 +117,7 @@
+@@ -132,6 +132,7 @@
  #define XFLG_OLD_PREFIXES	(1<<1)
  #define XFLG_ANCHORED2ABS	(1<<2)
  #define XFLG_ABS_IF_SLASH	(1<<3)