- Make this code handle multibyte character encodings, and honor the
--iconv setting when converting case.
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
diff --git a/exclude.c b/exclude.c
-index 5fa6e00..5b3b135 100644
--- a/exclude.c
+++ b/exclude.c
@@ -21,6 +21,7 @@
extern int am_server;
extern int am_sender;
-@@ -697,16 +698,15 @@ static int rule_matches(const char *fname, struct filter_struct *ex, int name_is
+@@ -687,16 +688,15 @@ static int rule_matches(const char *fname, filter_rule *ex, int name_is_dir)
if (litmatch_array(pattern, strings, slash_handling))
return ret_match;
} else if (anchored_match) {
return !ret_match;
diff --git a/flist.c b/flist.c
-index 09b4fc5..ae70300 100644
--- a/flist.c
+++ b/flist.c
@@ -34,6 +34,7 @@ extern int am_generator;
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -2924,6 +2925,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2934,6 +2935,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
{
int dif;
const uchar *c1, *c2;
enum fnc_state state1, state2;
enum fnc_type type1, type2;
enum fnc_type t_path = protocol_version >= 29 ? t_PATH : t_ITEM;
-@@ -3034,7 +3036,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -3044,7 +3046,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
return dif;
}
diff --git a/ifuncs.h b/ifuncs.h
-index 8c128d5..a4cfd3d 100644
--- a/ifuncs.h
+++ b/ifuncs.h
@@ -77,3 +77,38 @@ init_stat_x(stat_x *sx_p)
+#define ic_strNE(s1,s2) (!ic_strEQ(s1,s2))
+#define ic_strnNE(s1,s2) (!ic_strnEQ(s1,s2,n))
diff --git a/lib/wildmatch.c b/lib/wildmatch.c
-index f3a1731..72660ca 100644
--- a/lib/wildmatch.c
+++ b/lib/wildmatch.c
@@ -53,6 +53,8 @@
}
diff --git a/options.c b/options.c
-index e7c6c61..6e73e9c 100644
--- a/options.c
+++ b/options.c
@@ -117,6 +117,7 @@ OFF_T max_size = 0;
{"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},
-@@ -2505,6 +2509,9 @@ void server_options(char **args, int *argc_p)
+@@ -2522,6 +2526,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
if (partial_dir != tmp_partialdir) {
args[ac++] = "--partial-dir";
diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..339aca8 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -414,6 +414,7 @@ to the detailed description below for a complete description. verb(
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
-@@ -1563,6 +1564,10 @@ If you use this option with bf(--iconv), the args will also be translated
+@@ -1582,6 +1583,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.
scratch directory when creating temporary copies of the files transferred
on the receiving side. The default behavior is to create each temporary
diff --git a/wildtest.c b/wildtest.c
-index 07351a1..c899eb8 100644
--- a/wildtest.c
+++ b/wildtest.c
@@ -30,6 +30,7 @@