- Make this code handle multibyte character encodings, and honor the
--iconv setting when converting case.
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
diff --git a/exclude.c b/exclude.c
--- a/exclude.c
+++ b/exclude.c
extern int ignore_errors;
extern int numeric_ids;
extern int recurse;
-@@ -2880,6 +2881,7 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2886,6 +2887,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;
-@@ -2990,7 +2992,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
+@@ -2996,7 +2998,15 @@ int f_name_cmp(const struct file_struct *f1, const struct file_struct *f2)
if (type1 != type2)
return type1 == t_PATH ? 1 : -1;
}
diff --git a/rsync.yo b/rsync.yo
--- a/rsync.yo
+++ b/rsync.yo
-@@ -406,6 +406,7 @@ to the detailed description below for a complete description. verb(
+@@ -419,6 +419,7 @@ to the detailed description below for a complete description. verb(
--files-from=FILE read list of source-file names from FILE
-0, --from0 all *from/filter files are delimited by 0s
-s, --protect-args no space-splitting; wildcard chars only
--address=ADDRESS bind address for outgoing socket to daemon
--port=PORT specify double-colon alternate port number
--sockopts=OPTIONS specify custom TCP options
-@@ -1522,6 +1523,10 @@ side will also be translated
+@@ -1548,6 +1549,10 @@ side 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.