Made "make test" work.

diff --git a/ignore-case.diff b/ignore-case.diff
index 8323d2a..74d4f9d 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -1,66 +1,41 @@
-From: David Bolen <db3l@fitlinxx.com>
-To: Peter Tattam <peter@jazz-1.trumpet.com.au>
-Cc: rsync@lists.samba.org
-Subject: RE: mixed case file systems.
-Date: Thu, 18 Apr 2002 23:04:06 -0400
-
-Peter Tattam [peter@jazz-1.trumpet.com.au] writes:
-
-> I believe a suitable workaround would be to ignore case for file names
-> when the rsync process is undertaken.  Is this facility available or
-> planned in the near future?
-
-I've attached a context diff for some changes I made to our local copy
-a while back to add an "--ignore-case" option just for this purpose.
-In our case it came up in the context of disting between NTFS and FAT
-remote systems.  I think we ended up not needing it, but it does make
-rsync match filenames in a case insensitive manner, so it might at
-least be worth trying to see if it resolves your issue.
-
-A few caveats - both ends have to support the option - I couldn't make
-it backwards compatible because both ends exchange information about a
-sorted file list that has to sort the same way on either side (which
-very subtly bit me when I first did this).  I also didn't bump the
-protocol in this patch (wasn't quite sure it was appropriate just for an
-incompatible command line option) since it was for local use.
-
-NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
-
--- David
-
-/-----------------------------------------------------------------------\
- \               David Bolen            \   E-mail: db3l@fitlinxx.com  /
-  |             FitLinxx, Inc.            \  Phone: (203) 708-5192    |
- /  860 Canal Street, Stamford, CT  06902   \  Fax: (203) 316-5150     \
-\-----------------------------------------------------------------------/
-
-         - - - - - - - - - - - - - - - - - - - - - - - - -
+This adds the --ignore-case option, which makes rsync compare filenames
+in a case-insensitive manner.
 
 --- orig/lib/wildmatch.c       2003-07-14 15:12:59
-+++ lib/wildmatch.c    2004-06-18 17:27:00
-@@ -76,8 +76,20 @@ static int domatch(const unsigned char *
++++ lib/wildmatch.c    2004-08-13 16:43:27
+@@ -53,6 +53,8 @@
+ #define ISUPPER(c) (ISASCII(c) && isupper(c))
+ #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
+ 
++extern int ignore_case;
++
+ #ifdef WILD_TEST_ITERATIONS
+ int wildmatch_iteration_count;
+ #endif
+@@ -76,9 +78,19 @@ static int domatch(const unsigned char *
            ch = *++p;
            /* FALLTHROUGH */
          default:
 -          if (*text != ch)
-+          if (*text != ch) {
-+              extern int ignore_case;
-+              if (ignore_case) {
-+                  if (ISUPPER(*text)) {
-+                      if (tolower(*text) == ch)
-+                          continue;
-+                  }
-+                  else if (ISUPPER(ch)) {
-+                      if (*text == tolower(ch))
-+                          continue;
-+                  }
+-              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;
 +          }
-           continue;
++          return FALSE;
          case '?':
            /* Match anything but '/'. */
---- orig/options.c     2004-08-11 23:42:23
+           if (*text == '/')
+--- orig/options.c     2004-08-12 18:34:38
 +++ options.c  2004-07-29 16:13:45
 @@ -92,6 +92,7 @@ int opt_ignore_existing = 0;
  int max_delete = 0;
@@ -96,25 +71,59 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
        if (partial_dir && am_sender) {
                args[ac++] = "--partial-dir";
                args[ac++] = partial_dir;
---- orig/util.c        2004-08-11 23:42:23
-+++ util.c     2004-07-03 20:19:20
-@@ -1029,6 +1029,19 @@ int u_strcmp(const char *cs1, const char
+--- orig/t_stub.c      2004-07-29 16:08:04
++++ t_stub.c   2004-08-13 17:19:56
+@@ -28,6 +28,7 @@
+ 
+ int modify_window = 0;
+ int module_id = -1;
++int ignore_case = 0;
+ char *partial_dir;
+ struct exclude_list_struct server_exclude_list;
+ 
+--- orig/util.c        2004-08-13 07:18:59
++++ util.c     2004-08-13 16:40:34
+@@ -31,6 +31,7 @@ extern int verbose;
+ extern int dry_run;
+ extern int module_id;
+ extern int modify_window;
++extern int ignore_case;
+ extern char *partial_dir;
+ extern struct exclude_list_struct server_exclude_list;
+ 
+@@ -1015,11 +1016,23 @@ int u_strcmp(const char *cs1, const char
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;
-+      extern int ignore_case;
 +      
 +      if (ignore_case) {
-+              while (*s1 && *s2) {
-+                      uchar c1 = islower(*s1) ? toupper(*s1) : *s1;
-+                      uchar c2 = islower(*s2) ? toupper(*s2) : *s2;
-+                      if (c1 != c2)
-+                              return (int)c1 - (int)c2;
-+                      s1++; s2++;
++              uchar c1, c2;
++              while (1) {
++                      c1 = islower(*s1) ? toupper(*s1) : *s1;
++                      c2 = islower(*s2) ? toupper(*s2) : *s2;
++                      if (!c1 || c1 != c2)
++                              break;
++                      s1++, s2++;
 +              }
+ 
+-      while (*s1 && *s2 && (*s1 == *s2)) {
+-              s1++; s2++;
++              return (int)c1 - (int)c2;
+       }
+ 
++      while (*s1 && *s1 == *s2)
++              s1++, s2++;
 +
-+              return (int)*s1 - (int)*s2;
-+      }
+       return (int)*s1 - (int)*s2;
+ }
+ 
+--- orig/wildtest.c    2004-02-07 18:40:52
++++ wildtest.c 2004-08-13 17:19:34
+@@ -16,6 +16,7 @@ int fnmatch_errors = 0;
+ #endif
+ 
+ int wildmatch_errors = 0;
++int ignore_case = 0;
+ 
+ typedef char bool;
  
-       while (*s1 && *s2 && (*s1 == *s2)) {
-               s1++; s2++;