Updated to apply cleanly.

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

diff --git a/ignore-case.diff b/ignore-case.diff
index aff192f..5a0b6cb 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -35,7 +35,7 @@ in a case-insensitive manner.
          case '?':
            /* Match anything but '/'. */
            if (*text == '/')
---- orig/options.c     2005-05-10 15:32:58
+--- orig/options.c     2005-05-19 08:52:42
 +++ options.c  2005-05-03 16:47:52
 @@ -101,6 +101,7 @@ int max_delete = 0;
  OFF_T max_size = 0;
@@ -53,7 +53,7 @@ in a case-insensitive manner.
    rprintf(F,"     --address=ADDRESS       bind address for outgoing socket to daemon\n");
    rprintf(F,"     --port=PORT             specify double-colon alternate port number\n");
    rprintf(F,"     --blocking-io           use blocking I/O for the remote shell\n");
-@@ -393,6 +395,7 @@ static struct poptOption long_options[] 
+@@ -392,6 +394,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 },
@@ -61,7 +61,7 @@ in a case-insensitive manner.
    {"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 },
-@@ -1414,6 +1417,9 @@ void server_options(char **args,int *arg
+@@ -1410,6 +1413,9 @@ void server_options(char **args,int *arg
                args[ac++] = arg;
        }