X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/afcb578c53a1c5579d48336e2197e476cead7057..88f7513df3fca996d2669285ddb48a362a9a9825:/source-filter_dest-filter.diff diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index a6c6e54..3ec3dea 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -39,7 +39,7 @@ After applying this patch, run these commands for a successful build: extern int size_only; extern OFF_T max_size; extern OFF_T min_size; -@@ -379,7 +380,7 @@ void itemize(struct file_struct *file, i +@@ -376,7 +377,7 @@ void itemize(struct file_struct *file, i /* Perform our quick-check heuristic for determining if a file is unchanged. */ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) { @@ -48,6 +48,17 @@ After applying this patch, run these commands for a successful build: return 0; /* if always checksum is set then we use the checksum instead +--- old/main.c ++++ new/main.c +@@ -119,7 +119,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; @@ -58,16 +69,16 @@ After applying this patch, run these commands for a successful build: int daemon_bwlimit = 0; int bwlimit = 0; int fuzzy_basis = 0; -@@ -148,6 +149,8 @@ char *basis_dir[MAX_BASIS_DIRS+1]; - char *config_file = NULL; - char *shell_cmd = NULL; - char *log_format = NULL; +@@ -151,6 +152,8 @@ char *log_format = NULL; + char *logfile_name = NULL; + char *logfile_format = NULL; + char *password_file = NULL; +char *source_filter = NULL; +char *dest_filter = NULL; - char *password_file = NULL; char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; -@@ -332,6 +335,7 @@ void usage(enum logcode F) + char backup_dir_buf[MAXPATHLEN]; +@@ -337,6 +340,7 @@ void usage(enum logcode F) 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"); rprintf(F," --size-only skip files that match in size\n"); @@ -75,7 +86,7 @@ After applying this patch, run these commands for a successful build: 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) +@@ -373,6 +377,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"); @@ -84,7 +95,7 @@ After applying this patch, run these commands for a successful build: 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[] +@@ -453,6 +459,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 }, @@ -92,7 +103,7 @@ After applying this patch, run these commands for a successful build: {"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[] +@@ -528,6 +535,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 }, @@ -101,7 +112,7 @@ After applying this patch, run these commands for a successful build: {"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 +@@ -1406,6 +1415,16 @@ int parse_arguments(int *argc, const cha } } @@ -118,8 +129,8 @@ After applying this patch, run these commands for a successful build: if (files_from) { char *h, *p; int q; -@@ -1642,6 +1661,25 @@ void server_options(char **args,int *arg - args[ac++] = "--super"; +@@ -1671,6 +1690,25 @@ void server_options(char **args,int *arg + args[ac++] = "--size-only"; } + if (times_only && am_sender) @@ -141,12 +152,12 @@ After applying this patch, run these commands for a successful build: + 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, +@@ -159,3 +159,77 @@ pid_t local_child(int argc, char **argv, return pid; } @@ -226,7 +237,7 @@ After applying this patch, run these commands for a successful build: +} --- old/receiver.c +++ new/receiver.c -@@ -53,6 +53,7 @@ extern int inplace; +@@ -49,6 +49,7 @@ extern int inplace; extern int delay_updates; extern struct stats stats; extern char *log_format; @@ -234,8 +245,8 @@ After applying this patch, run these commands for a successful build: extern char *tmpdir; extern char *partial_dir; extern char *basis_dir[]; -@@ -350,6 +351,8 @@ int recv_files(int f_in, struct file_lis - : !am_server && log_format_has_i; +@@ -345,6 +346,8 @@ int recv_files(int f_in, struct file_lis + int itemizing = am_server ? logfile_format_has_i : log_format_has_i; int max_phase = protocol_version >= 29 ? 2 : 1; int i, recv_ok; + pid_t pid = 0; @@ -243,7 +254,7 @@ After applying this patch, run these commands for a successful build: if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); -@@ -362,6 +365,23 @@ int recv_files(int f_in, struct file_lis +@@ -357,6 +360,23 @@ int recv_files(int f_in, struct file_lis if (delay_updates) delayed_bits = bitbag_create(flist->count); @@ -267,7 +278,7 @@ After applying this patch, run these commands for a successful build: while (1) { cleanup_disable(); -@@ -604,6 +624,9 @@ int recv_files(int f_in, struct file_lis +@@ -599,6 +619,9 @@ int recv_files(int f_in, struct file_lis else if (!am_server && verbose && do_progress) rprintf(FINFO, "%s\n", fname); @@ -277,13 +288,13 @@ After applying this patch, run these commands for a successful build: /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, fname, fd2, file->length); -@@ -619,6 +642,16 @@ int recv_files(int f_in, struct file_lis +@@ -614,6 +637,16 @@ int recv_files(int f_in, struct file_lis exit_cleanup(RERR_FILEIO); } + 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); @@ -292,8 +303,8 @@ After applying this patch, run these commands for a successful build: + } + if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { - if (partialptr == fname || *partial_dir == '/') - partialptr = NULL; + char *temp_copy_name; + if (partialptr == fname) --- old/rsync.h +++ new/rsync.h @@ -103,6 +103,7 @@ @@ -306,7 +317,7 @@ After applying this patch, run these commands for a successful build: --- old/rsync.yo +++ new/rsync.yo -@@ -355,6 +355,7 @@ to the detailed description below for a +@@ -359,6 +359,7 @@ to the detailed description below for a --timeout=TIME set I/O timeout in seconds -I, --ignore-times don't skip files that match size and time --size-only skip files that match in size @@ -314,7 +325,7 @@ After applying this patch, run these commands for a successful build: --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 +@@ -395,6 +396,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 @@ -323,7 +334,7 @@ After applying this patch, run these commands for a successful build: --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- +@@ -1732,6 +1735,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. @@ -359,7 +370,7 @@ After applying this patch, run these commands for a successful build: version of rsync. For instance, if rsync 2.6.4 is being used with the --- old/sender.c +++ new/sender.c -@@ -41,6 +41,7 @@ extern int write_batch; +@@ -44,6 +44,7 @@ extern int write_batch; extern struct stats stats; extern struct file_list *the_file_list; extern char *log_format; @@ -367,8 +378,8 @@ After applying this patch, run these commands for a successful build: /** -@@ -219,6 +220,26 @@ void send_files(struct file_list *flist, - : !am_server && log_format_has_i; +@@ -221,6 +222,26 @@ void send_files(struct file_list *flist, + int itemizing = am_server ? logfile_format_has_i : log_format_has_i; int f_xfer = write_batch < 0 ? batch_fd : f_out; int i, j; + char *filter_argv[MAX_FILTER_ARGS + 1]; @@ -394,7 +405,7 @@ After applying this patch, run these commands for a successful build: if (verbose > 2) rprintf(FINFO, "send_files starting\n"); -@@ -293,6 +314,7 @@ void send_files(struct file_list *flist, +@@ -295,6 +316,7 @@ void send_files(struct file_list *flist, return; } @@ -402,7 +413,7 @@ After applying this patch, run these commands for a successful build: fd = do_open(fname, O_RDONLY, 0); if (fd == -1) { if (errno == ENOENT) { -@@ -321,6 +343,33 @@ void send_files(struct file_list *flist, +@@ -323,6 +345,33 @@ void send_files(struct file_list *flist, return; } @@ -420,7 +431,7 @@ After applying this patch, run these commands for a successful build: + 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", @@ -436,7 +447,7 @@ After applying this patch, run these commands for a successful build: if (st.st_size) { int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE); mbuf = map_file(fd, st.st_size, read_size, s->blength); -@@ -363,6 +412,8 @@ void send_files(struct file_list *flist, +@@ -365,6 +414,8 @@ void send_files(struct file_list *flist, } } close(fd);