Fixed some failing hunks.

[rsync/rsync-patches.git] / cvs-entries.diff

diff --git a/cvs-entries.diff b/cvs-entries.diff
index a279991..f685ac2 100644 (file)
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -2,9 +2,9 @@ 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.
 
---- exclude.c  7 Apr 2005 18:06:06 -0000       1.115
-+++ exclude.c  7 Apr 2005 18:06:34 -0000
-@@ -442,6 +442,14 @@ void *push_local_filters(const char *dir
+--- orig/exclude.c     2005-10-14 18:45:50
++++ exclude.c  2005-04-07 18:06:34
+@@ -446,6 +446,14 @@ void *push_local_filters(const char *dir
                                set_filter_dir(dir, dirlen);
                }
  
@@ -19,15 +19,15 @@ 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,
-@@ -958,6 +966,7 @@ void parse_filter_file(struct filter_lis
-       char line[MAXPATHLEN+MAX_RULE_PREFIX+1]; /* +1 for trailing slash. */
+@@ -962,6 +970,7 @@ void parse_filter_file(struct filter_lis
+       char line[BIGPATHBUFLEN];
        char *eob = line + sizeof line - 1;
        int word_split = mflags & MATCHFLG_WORD_SPLIT;
 +      int slash_parse = xflags & XFLG_CVS_ENTRIES ? 1 : 0;
  
        if (!fname || !*fname)
                return;
-@@ -1002,6 +1011,29 @@ void parse_filter_file(struct filter_lis
+@@ -1006,6 +1015,29 @@ void parse_filter_file(struct filter_lis
                                        continue;
                                break;
                        }
@@ -57,7 +57,7 @@ of excludes taken from the .cvsignore file.
                        if (word_split && isspace(ch))
                                break;
                        if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1011,6 +1043,7 @@ void parse_filter_file(struct filter_lis
+@@ -1015,6 +1047,7 @@ void parse_filter_file(struct filter_lis
                        else
                                overflow = 1;
                }
@@ -65,13 +65,13 @@ of excludes taken from the .cvsignore file.
                if (overflow) {
                        rprintf(FERROR, "discarding over-long filter: %s...\n", line);
                        s = line;
---- rsync.h    28 Mar 2005 17:08:47 -0000      1.261
-+++ rsync.h    7 Apr 2005 18:06:34 -0000
-@@ -115,6 +115,7 @@
- #define XFLG_FATAL_ERRORS     (1<<0)
+--- orig/rsync.h       2005-10-14 18:45:50
++++ rsync.h    2005-10-14 19:17:51
+@@ -116,6 +116,7 @@
  #define XFLG_OLD_PREFIXES     (1<<1)
  #define XFLG_ANCHORED2ABS     (1<<2)
-+#define XFLG_CVS_ENTRIES      (1<<3)
+ #define XFLG_ABS_IF_SLASH     (1<<3)
++#define XFLG_CVS_ENTRIES      (1<<4)
  
  #define PERMS_REPORT          (1<<0)
  #define PERMS_SKIP_MTIME      (1<<1)