Got rid of failing or fuzzy hunks.

[rsync/rsync-patches.git] / ignore-case.diff

diff --git a/ignore-case.diff b/ignore-case.diff
index d7483ca..7b317dd 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -36,25 +36,49 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
 
          - - - - - - - - - - - - - - - - - - - - - - - - -
 
---- options.c  17 Apr 2004 17:07:23 -0000      1.147
-+++ options.c  22 Apr 2004 23:44:15 -0000
-@@ -89,6 +89,7 @@ int opt_ignore_existing = 0;
+--- 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 *
+           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;
+         case '?':
+           /* Match anything but '/'. */
+--- orig/options.c     2004-07-29 16:08:03
++++ options.c  2004-07-29 16:13:45
+@@ -92,6 +92,7 @@ int opt_ignore_existing = 0;
  int max_delete = 0;
  int ignore_errors = 0;
  int modify_window = 0;
 +int ignore_case = 0;
  int blocking_io = -1;
  int checksum_seed = 0;
- unsigned int block_size = 0;
-@@ -275,6 +276,7 @@ void usage(enum logcode F)
+ int inplace = 0;
+@@ -288,6 +289,7 @@ void usage(enum logcode F)
    rprintf(F,"     --include-from=FILE     don't exclude patterns listed in FILE\n");
    rprintf(F,"     --files-from=FILE       read FILE for list of source-file names\n");
-   rprintf(F," -0  --from0                 all *-from file lists are delimited by nulls\n");
+   rprintf(F," -0, --from0                 all *-from file lists are delimited by nulls\n");
 +  rprintf(F,"     --ignore-case           ignore case when comparing filenames\n");
    rprintf(F,"     --version               print version number\n");
    rprintf(F,"     --daemon                run as an rsync daemon\n");
    rprintf(F,"     --no-detach             do not detach from the parent\n");
-@@ -329,6 +331,7 @@ static struct poptOption long_options[] 
+@@ -343,6 +345,7 @@ static struct poptOption long_options[] 
    {"include",          0,  POPT_ARG_STRING, 0,              OPT_INCLUDE, 0, 0 },
    {"exclude-from",     0,  POPT_ARG_STRING, 0,              OPT_EXCLUDE_FROM, 0, 0 },
    {"include-from",     0,  POPT_ARG_STRING, 0,              OPT_INCLUDE_FROM, 0, 0 },
@@ -62,19 +86,19 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
    {"safe-links",       0,  POPT_ARG_NONE,   &safe_symlinks, 0, 0, 0 },
    {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0 },
    {"backup",          'b', POPT_ARG_NONE,   &make_backups, 0, 0, 0 },
-@@ -911,6 +914,9 @@ void server_options(char **args,int *arg
-                       goto oom;
+@@ -983,6 +986,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }
-+
+ 
 +      if (ignore_case)
 +              args[ac++] = "--ignore-case";
- 
-       if (keep_partial)
-               args[ac++] = "--partial";
---- util.c     22 Apr 2004 22:17:15 -0000      1.138
-+++ util.c     22 Apr 2004 23:44:15 -0000
-@@ -924,6 +924,19 @@ int u_strcmp(const char *cs1, const char
++
+       if (partial_dir && am_sender) {
+               args[ac++] = "--partial-dir";
+               args[ac++] = partial_dir;
+--- orig/util.c        2004-07-29 16:08:04
++++ util.c     2004-07-03 20:19:20
+@@ -1037,6 +1037,19 @@ int u_strcmp(const char *cs1, const char
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;
@@ -94,27 +118,3 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
  
        while (*s1 && *s2 && (*s1 == *s2)) {
                s1++; s2++;
---- lib/wildmatch.c    14 Jul 2003 15:12:59 -0000      1.12
-+++ lib/wildmatch.c    22 Apr 2004 23:44:15 -0000
-@@ -76,8 +76,20 @@ 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;
-         case '?':
-           /* Match anything but '/'. */