./configure (optional if already run)
make
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/flist.c b/flist.c
-index 09b4fc5..f69167e 100644
--- a/flist.c
+++ b/flist.c
-@@ -87,6 +87,9 @@ extern int filesfrom_convert;
+@@ -88,6 +88,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;
-@@ -651,6 +654,24 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ #ifdef HAVE_UTIMENSAT
+ #ifdef HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC
+ #define ST_MTIME_NSEC st_mtim.tv_nsec
+@@ -675,6 +678,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)
{
-@@ -719,6 +740,9 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+ static int64 modtime;
+@@ -743,6 +764,9 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
}
#endif
clean_fname(thisname, 0);
diff --git a/options.c b/options.c
-index e7c6c61..cd0891c 100644
--- a/options.c
+++ b/options.c
@@ -190,6 +190,8 @@ int logfile_format_has_i = 0;
#define MAX_BATCH_NAME_LEN 256 /* Must be less than MAXPATHLEN-13 */
char *batch_name = NULL;
-@@ -782,6 +784,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");
-@@ -995,6 +998,7 @@ static struct poptOption long_options[] = {
+@@ -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
{"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_VAL, &allow_8bit_chars, 1, 0, 0 },
-@@ -2195,6 +2199,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2247,6 +2251,31 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
am_starting_up = 0;
return 1;
-@@ -2609,6 +2638,12 @@ void server_options(char **args, int *argc_p)
+@@ -2661,6 +2690,12 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
rprintf(FERROR, "argc overflow in server_options().\n");
exit_cleanup(RERR_MALLOC);
diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..dda8608 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -436,6 +436,7 @@ to the detailed description below for a complete description. verb(
--checksum-seed=NUM set block/file checksum seed (advanced)
-4, --ipv4 prefer IPv4
-6, --ipv6 prefer IPv6
-@@ -2294,6 +2295,22 @@ daemon uses the charset specified in its "charset" configuration parameter
+@@ -2373,6 +2374,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)).