return 0;
/* if always checksum is set then we use the checksum instead
+--- old/main.c
++++ new/main.c
+@@ -110,7 +110,7 @@ pid_t wait_process(pid_t pid, int *statu
+ }
+
+ /* Wait for a process to exit, calling io_flush while waiting. */
+-static void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
++void wait_process_with_flush(pid_t pid, int *exit_code_ptr)
+ {
+ pid_t waited_pid;
+ int status;
--- old/options.c
+++ new/options.c
@@ -99,6 +99,7 @@ int keep_partial = 0;
rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n");
rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n");
rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n");
-@@ -368,6 +372,8 @@ void usage(enum logcode F)
+@@ -367,6 +371,8 @@ void usage(enum logcode F)
rprintf(F," --write-batch=FILE write a batched update to FILE\n");
rprintf(F," --only-write-batch=FILE like --write-batch but w/o updating destination\n");
rprintf(F," --read-batch=FILE read a batched update from FILE\n");
rprintf(F," --protocol=NUM force an older protocol version to be used\n");
#ifdef INET6
rprintf(F," -4, --ipv4 prefer IPv4\n");
-@@ -445,6 +451,7 @@ static struct poptOption long_options[]
+@@ -443,6 +449,7 @@ static struct poptOption long_options[]
{"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
{"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 },
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
-@@ -519,6 +526,8 @@ static struct poptOption long_options[]
+@@ -517,6 +524,8 @@ static struct poptOption long_options[]
{"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
{"blocking-io", 0, POPT_ARG_VAL, &blocking_io, 1, 0, 0 },
{"no-blocking-io", 0, POPT_ARG_VAL, &blocking_io, 0, 0, 0 },
{"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
{"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 },
{"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 },
-@@ -1382,6 +1391,16 @@ int parse_arguments(int *argc, const cha
+@@ -1385,6 +1394,16 @@ int parse_arguments(int *argc, const cha
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1642,6 +1661,25 @@ void server_options(char **args,int *arg
- args[ac++] = "--super";
+@@ -1647,6 +1666,25 @@ void server_options(char **args,int *arg
+ args[ac++] = "--size-only";
}
+ if (times_only && am_sender)
+ args[ac++] = arg;
+ }
+
- if (size_only)
- args[ac++] = "--size-only";
-
+ if (modify_window_set) {
+ if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
+ goto oom;
--- old/pipe.c
+++ new/pipe.c
@@ -157,3 +157,77 @@ pid_t local_child(int argc, char **argv,
+ if (dest_filter) {
+ int status;
-+ wait_process(pid, &status);
++ wait_process_with_flush(pid, &status);
+ if (status != 0) {
+ rprintf(FERROR, "filter %s exited code: %d\n",
+ dest_filter, status);
--modify-window=NUM compare mod-times with reduced accuracy
-T, --temp-dir=DIR create temporary files in directory DIR
-y, --fuzzy find similar file for basis if no dest file
-@@ -391,6 +392,8 @@ to the detailed description below for a
+@@ -390,6 +391,8 @@ to the detailed description below for a
--write-batch=FILE write a batched update to FILE
--only-write-batch=FILE like --write-batch but w/o updating dest
--read-batch=FILE read a batched update from FILE
--protocol=NUM force an older protocol version to be used
--checksum-seed=NUM set block/file checksum seed (advanced)
-4, --ipv4 prefer IPv4
-@@ -1610,6 +1613,33 @@ file previously generated by bf(--write-
+@@ -1609,6 +1612,33 @@ file previously generated by bf(--write-
If em(FILE) is bf(-), the batch data will be read from standard input.
See the "BATCH MODE" section for details.
+ pid_t pid = run_filter_on_file(filter_argv, fd2, fd);
+ close(fd);
+ close(fd2);
-+ wait_process(pid, &status);
++ wait_process_with_flush(pid, &status);
+ if (status != 0) {
+ rprintf(FERROR,
+ "bypassing source filter %s; exited with code: %d\n",