The patches for 3.0.0pre9.

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

diff --git a/ignore-case.diff b/ignore-case.diff
index 6faa4a6..eb5623d 100644 (file)
--- a/ignore-case.diff
+++ b/ignore-case.diff
@@ -55,7 +55,7 @@ diff --git a/flist.c b/flist.c
  extern int ignore_errors;
  extern int numeric_ids;
  extern int recurse;
-@@ -2604,6 +2605,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2615,6 +2616,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
  {
        int dif;
        const uchar *c1, *c2;
@@ -63,7 +63,7 @@ diff --git a/flist.c b/flist.c
        enum fnc_state state1, state2;
        enum fnc_type type1, type2;
        enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -2714,7 +2716,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2725,7 +2727,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
                        if (type1 != type2)
                                return type1 == t_PATH ? 1 : -1;
                }
@@ -236,7 +236,7 @@ diff --git a/options.c b/options.c
    {"files-from",       0,  POPT_ARG_STRING, &files_from, 0, 0, 0 },
    {"from0",           '0', POPT_ARG_VAL,    &eol_nulls, 1, 0, 0},
    {"no-from0",         0,  POPT_ARG_VAL,    &eol_nulls, 0, 0, 0},
-@@ -1916,6 +1920,9 @@ void server_options(char **args, int *argc_p)
+@@ -1917,6 +1921,9 @@ void server_options(char **args, int *argc_p)
                args[ac++] = arg;
        }
  
@@ -257,7 +257,7 @@ diff --git a/rsync.yo b/rsync.yo
       --address=ADDRESS       bind address for outgoing socket to daemon
       --port=PORT             specify double-colon alternate port number
       --sockopts=OPTIONS      specify custom TCP options
-@@ -1409,6 +1410,10 @@ If you use this option with bf(--iconv), the args will also be translated
+@@ -1425,6 +1426,10 @@ If you use this option with bf(--iconv), the args will also be translated
  from the local to the remote character set.  The translation happens before
  wild-cards are expanded.  See also the bf(--files-from) option.