Fixed failing hunks.

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

diff --git a/ignore-case.diff b/ignore-case.diff
index b589add..206ae68 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -36,9 +36,9 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
 
          - - - - - - - - - - - - - - - - - - - - - - - - -
 
---- options.c  22 Feb 2004 08:56:43 -0000      1.139
-+++ options.c  23 Feb 2004 19:25:19 -0000
-@@ -87,6 +87,7 @@ int opt_ignore_existing = 0;
+--- options.c  17 Apr 2004 17:07:23 -0000      1.147
++++ options.c  29 Apr 2004 19:50:13 -0000
+@@ -89,6 +89,7 @@ int opt_ignore_existing = 0;
  int max_delete = 0;
  int ignore_errors = 0;
  int modify_window = 0;
@@ -46,7 +46,7 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
  int blocking_io = -1;
  int checksum_seed = 0;
  unsigned int block_size = 0;
-@@ -273,6 +274,7 @@ void usage(enum logcode F)
+@@ -275,6 +276,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");
@@ -54,7 +54,7 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
    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");
-@@ -327,6 +329,7 @@ static struct poptOption long_options[] 
+@@ -329,6 +331,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,7 +62,7 @@ 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 },
-@@ -892,6 +895,9 @@ void server_options(char **args,int *arg
+@@ -911,6 +914,9 @@ void server_options(char **args,int *arg
                        goto oom;
                args[ac++] = arg;
        }
@@ -72,9 +72,9 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
  
        if (keep_partial)
                args[ac++] = "--partial";
---- util.c     17 Feb 2004 23:13:10 -0000      1.132
-+++ util.c     23 Feb 2004 19:25:20 -0000
-@@ -890,6 +890,19 @@ int u_strcmp(const char *cs1, const char
+--- util.c     27 Apr 2004 19:59:37 -0000      1.141
++++ util.c     29 Apr 2004 19:50:13 -0000
+@@ -933,6 +933,19 @@ int u_strcmp(const char *cs1, const char
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;
@@ -95,7 +95,7 @@ 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    23 Feb 2004 19:25:20 -0000
++++ lib/wildmatch.c    29 Apr 2004 19:50:13 -0000
 @@ -76,8 +76,20 @@ static int domatch(const unsigned char *
            ch = *++p;
            /* FALLTHROUGH */