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 0677edc..7b317dd 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -60,8 +60,8 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
            continue;
          case '?':
            /* Match anything but '/'. */
---- orig/options.c     2004-07-16 20:07:22
-+++ options.c  2004-07-03 20:19:20
+--- 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;
@@ -70,7 +70,7 @@ NOTE: patch updated for latest CVS source by Wayne Davison, but UNTESTED!
  int blocking_io = -1;
  int checksum_seed = 0;
  int inplace = 0;
-@@ -285,6 +286,7 @@ void usage(enum logcode F)
+@@ -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");
@@ -78,7 +78,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");
-@@ -340,6 +342,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 },
@@ -86,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 },
-@@ -963,6 +966,9 @@ void server_options(char **args,int *arg
+@@ -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";
- 
---- orig/util.c        2004-06-09 21:54:47
+       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
-@@ -951,6 +951,19 @@ int u_strcmp(const char *cs1, const char
+@@ -1037,6 +1037,19 @@ int u_strcmp(const char *cs1, const char
  {
        const uchar *s1 = (const uchar *)cs1;
        const uchar *s2 = (const uchar *)cs2;