./configure (optional if already run)
make
---- old/flist.c
-+++ new/flist.c
-@@ -80,6 +80,9 @@ extern int filesfrom_convert;
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -86,6 +86,9 @@ extern int filesfrom_convert;
extern iconv_t ic_send, ic_recv;
#endif
+extern char *tr_opt, *tr_left, *tr_right;
+extern int tr_right_len;
+
- #define PTR_SIZE (sizeof (struct file_struct *))
-
- int io_error;
-@@ -600,6 +603,24 @@ static void send_file_entry(int f, struc
+ #ifdef HAVE_UTIMENSAT
+ #ifdef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
+ #define ST_MTIME_NSEC st_mtim.tv_nsec
+@@ -673,6 +676,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
stats.total_size += F_LENGTH(file);
}
+ *p2 = '\0';
+}
+
- static struct file_struct *recv_file_entry(struct file_list *flist,
- int xflags, int f)
+ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
{
-@@ -668,6 +689,9 @@ static struct file_struct *recv_file_ent
+ static int64 modtime;
+@@ -741,6 +762,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
}
#endif
+ if (tr_opt)
+ transliterate(thisname);
+
- clean_fname(thisname, 0);
+ if (*thisname)
+ clean_fname(thisname, 0);
- if (sanitize_paths)
---- old/options.c
-+++ new/options.c
-@@ -181,6 +181,8 @@ int logfile_format_has_i = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -190,6 +190,8 @@ int logfile_format_has_i = 0;
int logfile_format_has_o_or_i = 0;
int always_checksum = 0;
int list_only = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -423,6 +425,7 @@ void usage(enum logcode F)
+@@ -783,6 +785,7 @@ void usage(enum logcode F)
#ifdef ICONV_OPTION
rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filenames\n");
#endif
rprintf(F," -4, --ipv4 prefer IPv4\n");
rprintf(F," -6, --ipv6 prefer IPv6\n");
rprintf(F," --version print version number\n");
-@@ -609,6 +612,7 @@ static struct poptOption long_options[]
- #ifdef ICONV_OPTION
+@@ -996,6 +999,7 @@ static struct poptOption long_options[] = {
{"iconv", 0, POPT_ARG_STRING, &iconv_opt, 0, 0, 0 },
+ {"no-iconv", 0, POPT_ARG_NONE, 0, OPT_NO_ICONV, 0, 0 },
#endif
+ {"tr", 0, POPT_ARG_STRING, &tr_opt, 0, 0, 0 },
{"ipv4", '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{"ipv6", '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
- {"8-bit-output", '8', POPT_ARG_NONE, &allow_8bit_chars, 0, 0, 0 },
-@@ -1620,6 +1624,31 @@ int parse_arguments(int *argc_p, const c
+ {"8-bit-output", '8', POPT_ARG_VAL, &allow_8bit_chars, 1, 0, 0 },
+@@ -2232,6 +2236,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
am_starting_up = 0;
return 1;
-@@ -1988,6 +2017,12 @@ void server_options(char **args, int *ar
+@@ -2646,6 +2675,12 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
+ args[ac++] = arg;
+ }
+
- *argc_p = ac;
- return;
-
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -422,6 +422,7 @@ to the detailed description below for a
+ if (ac > MAX_SERVER_ARGS) { /* Not possible... */
+ rprintf(FERROR, "argc overflow in server_options().\n");
+ exit_cleanup(RERR_MALLOC);
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -436,6 +436,7 @@ to the detailed description below for a complete description. verb(
--read-batch=FILE read a batched update from FILE
--protocol=NUM force an older protocol version to be used
--iconv=CONVERT_SPEC request charset conversion of filenames
--checksum-seed=NUM set block/file checksum seed (advanced)
-4, --ipv4 prefer IPv4
-6, --ipv6 prefer IPv6
-@@ -2013,6 +2014,22 @@ specifying matching rules that can match
- For instance, you can specify extra include/exclude rules if there are
- filename differences on the two sides that need to be accounted for.
+@@ -2359,6 +2360,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+ regardless of the remote charset you actually pass. Thus, you may feel free to
+ specify just the local charset for a daemon transfer (e.g. bf(--iconv=utf8)).
+dit(bf(--tr=BAD/GOOD)) Transliterates filenames on the receiver, after the
+iconv conversion (if any). This can be used to remove characters illegal