rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n");
-@@ -501,6 +503,7 @@ static struct poptOption long_options[]
+@@ -500,6 +502,7 @@ static struct poptOption long_options[]
{"only-write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_ONLY_WRITE_BATCH, 0, 0 },
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
{"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids, 0, 0, 0 },
{"timeout", 0, POPT_ARG_INT, &io_timeout, 0, 0, 0 },
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
-@@ -1694,6 +1697,9 @@ void server_options(char **args,int *arg
+@@ -1698,6 +1701,9 @@ void server_options(char **args,int *arg
args[ac++] = tmpdir;
}
extern int basis_dir_cnt;
extern int make_backups;
extern int cleanup_got_literal;
-@@ -318,6 +319,12 @@ static int receive_data(int f_in, char *
+@@ -256,6 +257,12 @@ static int receive_data(int f_in, char *
exit_cleanup(RERR_FILEIO);
}
if (mapbuf)
--- old/t_stub.c
+++ new/t_stub.c
-@@ -30,6 +30,7 @@ int modify_window = 0;
+@@ -26,6 +26,7 @@
+ * functions, so that module test harnesses can run standalone.
+ **/
+
++int do_fsync = 0;
+ int modify_window = 0;
int module_id = -1;
int relative_paths = 0;
- int human_readable = 0;
-+int do_fsync;
- char *partial_dir;
- struct filter_list_struct server_filter_list;
-
--- old/util.c
+++ new/util.c
@@ -30,6 +30,7 @@
extern int modify_window;
extern int relative_paths;
extern int human_readable;
-@@ -312,6 +313,12 @@ int copy_file(const char *source, const
+@@ -318,6 +319,12 @@ int copy_file(const char *source, const
return -1;
}