From ffadcb36bef7c620b33232f88a77bb0de117ac60 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 30 Dec 2005 07:39:41 +0000
Subject: [PATCH] Fixed failing hunks.

---
 cvs-entries.diff | 18 ++++++++--------
 ignore-case.diff | 55 ++++++++++++++++++++++++------------------------
 2 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/cvs-entries.diff b/cvs-entries.diff
index 6b9a245..61255e2 100644
--- a/cvs-entries.diff
+++ b/cvs-entries.diff
@@ -2,7 +2,7 @@ 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.
 
---- orig/exclude.c	2005-12-17 21:02:32
+--- orig/exclude.c	2005-12-24 07:53:38
 +++ exclude.c	2005-12-17 21:18:38
 @@ -212,6 +212,8 @@ static void add_rule(struct filter_list_
  		if (!(lp = new_array(struct filter_list_struct, 1)))
@@ -88,17 +88,17 @@ of excludes taken from the .cvsignore file.
  
  #define PERMS_REPORT		(1<<0)
  #define PERMS_SKIP_MTIME	(1<<1)
---- orig/testsuite/exclude.test	2005-02-26 19:47:43
-+++ testsuite/exclude.test	2005-12-17 19:52:49
-@@ -21,6 +21,7 @@ set -x
- # Build some files/dirs/links to copy
+--- orig/testsuite/exclude.test	2005-12-24 07:49:27
++++ testsuite/exclude.test	2005-12-30 07:32:41
+@@ -22,6 +22,7 @@ set -x
  
  makepath "$fromdir/foo/down/to/you"
+ makepath "$fromdir/foo/sub"
 +makepath "$fromdir/bar/down/to/CVS"
  makepath "$fromdir/bar/down/to/foo/too"
  makepath "$fromdir/bar/down/to/bar/baz"
  makepath "$fromdir/mid/for/foo/and/that/is/who"
-@@ -56,6 +57,9 @@ echo cvsout >"$fromdir/bar/down/to/foo/f
+@@ -58,6 +59,9 @@ echo cvsout >"$fromdir/bar/down/to/foo/f
  echo gone >"$fromdir/bar/down/to/foo/file3"
  echo lost >"$fromdir/bar/down/to/foo/file4"
  echo weird >"$fromdir/bar/down/to/foo/+ file3"
@@ -108,7 +108,7 @@ of excludes taken from the .cvsignore file.
  echo cvsout-but-filtin >"$fromdir/bar/down/to/foo/file4.junk"
  echo smashed >"$fromdir/bar/down/to/foo/to"
  cat >"$fromdir/bar/down/to/bar/.filt2" <<EOF
-@@ -98,7 +102,18 @@ cat >"$excl" <<EOF
+@@ -101,7 +105,18 @@ cat >"$excl" <<EOF
  EOF
  
  cat >"$scratchdir/.cvsignore" <<EOF
@@ -128,7 +128,7 @@ of excludes taken from the .cvsignore file.
  EOF
  
  # Create the chk dir with what we expect to be excluded
-@@ -125,6 +140,10 @@ checkit "$RSYNC -avv --exclude-from=\"$e
+@@ -128,6 +143,10 @@ checkit "$RSYNC -avv --exclude-from=\"$e
  # Modify the chk dir by removing cvs-ignored files and then tweaking the dir times.
  
  rm "$chkdir"/foo/*.old
@@ -139,7 +139,7 @@ of excludes taken from the .cvsignore file.
  rm "$chkdir"/bar/down/to/foo/*.bak
  rm "$chkdir"/bar/down/to/foo/*.junk
  rm "$chkdir"/bar/down/to/home-cvs-exclude
-@@ -140,8 +159,12 @@ checkit "$RSYNC -avvC --filter=\"merge $
+@@ -143,8 +162,12 @@ checkit "$RSYNC -avvC --filter=\"merge $
  
  # Modify the chk dir for our merge-exclude test and then tweak the dir times.
  
diff --git a/ignore-case.diff b/ignore-case.diff
index 65b0716..2933b27 100644
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,8 +1,8 @@
 This adds the --ignore-case option, which makes rsync compare filenames
 in a case-insensitive manner.
 
---- orig/lib/wildmatch.c	2005-01-28 21:01:21
-+++ lib/wildmatch.c	2004-08-13 16:43:27
+--- orig/lib/wildmatch.c	2005-12-30 07:31:41
++++ lib/wildmatch.c	2005-12-30 07:38:42
 @@ -53,6 +53,8 @@
  #define ISUPPER(c) (ISASCII(c) && isupper(c))
  #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
@@ -12,30 +12,31 @@ in a case-insensitive manner.
  #ifdef WILD_TEST_ITERATIONS
  int wildmatch_iteration_count;
  #endif
-@@ -76,9 +78,19 @@ static int domatch(const uchar *p, const
- 	    ch = *++p;
- 	    /* FALLTHROUGH */
- 	  default:
--	    if (*text != ch)
--		return FALSE;
--	    continue;
-+	    if (*text == ch)
-+		continue;
-+	    if (ignore_case) {
-+		if (ISUPPER(*text)) {
-+		    if (tolower(*text) == ch)
-+			continue;
-+		}
-+		else if (ISUPPER(ch)) {
-+		    if (*text == tolower(ch))
-+			continue;
-+		}
-+	    }
-+	    return FALSE;
- 	  case '?':
- 	    /* Match anything but '/'. */
- 	    if (*text == '/')
---- orig/options.c	2005-11-12 20:13:05
+@@ -71,6 +73,8 @@ static int dowild(const uchar *p, const 
+     for ( ; (p_ch = *p) != '\0'; text++, p++) {
+ 	int matched, special;
+ 	uchar t_ch, prev_ch;
++	if (ignore_case && ISUPPER(p_ch))
++	    p_ch = tolower(p_ch);
+ 	if ((t_ch = *text) == '\0' && p_ch != '*')
+ 	    return ABORT_ALL;
+ 	if (force_lower_case && ISUPPER(t_ch))
+@@ -211,10 +215,13 @@ static int dowild(const uchar *p, const 
+ /* Match the "pattern" against the "text" string. */
+ int wildmatch(const char *pattern, const char *text)
+ {
++    int ret;
+ #ifdef WILD_TEST_ITERATIONS
+     wildmatch_iteration_count = 0;
+ #endif
+-    return dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
++    force_lower_case = ignore_case;
++    ret = dowild((const uchar*)pattern, (const uchar*)text) == TRUE;
++    force_lower_case = 0;
+ }
+ 
+ /* Match the "pattern" against the forced-to-lower-case "text" string. */
+--- orig/options.c	2005-12-24 07:49:26
 +++ options.c	2005-10-14 19:19:18
 @@ -105,6 +105,7 @@ OFF_T max_size = 0;
  OFF_T min_size = 0;
@@ -61,7 +62,7 @@ in a case-insensitive manner.
    {"numeric-ids",      0,  POPT_ARG_NONE,   &numeric_ids, 0, 0, 0 },
    {"timeout",          0,  POPT_ARG_INT,    &io_timeout, 0, 0, 0 },
    {"rsh",             'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1563,6 +1566,9 @@ void server_options(char **args,int *arg
+@@ -1575,6 +1578,9 @@ void server_options(char **args,int *arg
  		args[ac++] = arg;
  	}
  
-- 
2.34.1