Updated patches to work with the current trunk.

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

diff --git a/cvs-entries.diff b/cvs-entries.diff
index be52c61..436ede8 100644 (file)
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -9,18 +9,19 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/exclude.c b/exclude.c
+index 5fa6e00..60e557d 100644
 --- a/exclude.c
 +++ b/exclude.c
-@@ -239,6 +239,8 @@ static void add_rule(struct filter_list_struct *listp, const char *pat,
+@@ -275,6 +275,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;
+               lp->head = lp->tail = lp->parent_dirscan_head = NULL;
 +              if (mflags & MATCHFLG_CVS_IGNORE)
 +                      cp = "CVS";
                if (asprintf(&lp->debug_type, " [per-dir %s]", cp) < 0)
                        out_of_memory("add_rule");
                ret->u.mergelist = lp;
-@@ -470,6 +472,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
+@@ -536,6 +538,14 @@ void *push_local_filters(const char *dir, unsigned int dirlen)
                                set_filter_dir(dir, dirlen);
                }
  
@@ -35,7 +36,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,
-@@ -1030,6 +1040,7 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
+@@ -1122,6 +1132,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 +44,7 @@ diff --git a/exclude.c b/exclude.c
  
        if (!fname || !*fname)
                return;
-@@ -1076,6 +1087,24 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
+@@ -1168,6 +1179,24 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
                                }
                                break;
                        }
@@ -68,7 +69,7 @@ diff --git a/exclude.c b/exclude.c
                        if (word_split && isspace(ch))
                                break;
                        if (eol_nulls? !ch : (ch == '\n' || ch == '\r'))
-@@ -1085,13 +1114,15 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
+@@ -1177,13 +1206,15 @@ void parse_filter_file(struct filter_list_struct *listp, const char *fname,
                        else
                                overflow = 1;
                }
@@ -86,9 +87,10 @@ diff --git a/exclude.c b/exclude.c
                if (ch == EOF)
                        break;
 diff --git a/rsync.h b/rsync.h
+index be7cf8a..6605092 100644
 --- a/rsync.h
 +++ b/rsync.h
-@@ -151,6 +151,7 @@
+@@ -152,6 +152,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 */
@@ -97,6 +99,7 @@ diff --git a/rsync.h b/rsync.h
  #define ATTRS_REPORT          (1<<0)
  #define ATTRS_SKIP_MTIME      (1<<1)
 diff --git a/testsuite/exclude.test b/testsuite/exclude.test
+index 099344f..993edcc 100644
 --- a/testsuite/exclude.test
 +++ b/testsuite/exclude.test
 @@ -19,6 +19,7 @@ export CVSIGNORE