X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/33d38bc89798f6f3c7d4c460c37e888e0fecc097..99397a259069fc1ee876b6370e1ffe9cd29913be:/source-filter_dest-filter.diff diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index 36b426b..319aa18 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -23,30 +23,46 @@ Implementation details for the --source-filter and -dest-filter options: - If the COMMAND contains single quotes, option-passing breaks. (Needs to be fixed.) -You should run "make proto" before running "make". +To use this patch, run these commands for a successful build: ---- orig/generator.c 2005-08-17 06:45:07 -+++ generator.c 2005-08-17 07:28:01 -@@ -58,6 +58,7 @@ extern int append_mode; + patch -p1 st_size != file->length) -+ if (!times_only && st->st_size != file->length) +- if (st->st_size != F_LENGTH(file)) ++ if (!times_only && st->st_size != F_LENGTH(file)) return 0; /* if always checksum is set then we use the checksum instead ---- orig/options.c 2005-07-28 01:46:25 -+++ options.c 2005-08-17 07:47:00 -@@ -91,6 +91,7 @@ int keep_partial = 0; +--- old/main.c ++++ new/main.c +@@ -133,7 +133,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 +@@ -103,6 +103,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; int size_only = 0; @@ -54,16 +70,16 @@ You should run "make proto" before running "make". int daemon_bwlimit = 0; int bwlimit = 0; int fuzzy_basis = 0; -@@ -139,6 +140,8 @@ char *basis_dir[MAX_BASIS_DIRS+1]; - char *config_file = NULL; - char *shell_cmd = NULL; - char *log_format = NULL; +@@ -160,6 +161,8 @@ char *logfile_name = NULL; + char *logfile_format = NULL; + char *stdout_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; -@@ -318,6 +321,7 @@ void usage(enum logcode F) + char backup_dir_buf[MAXPATHLEN]; +@@ -380,6 +383,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"); @@ -71,33 +87,33 @@ You should run "make proto" before running "make". 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"); -@@ -350,6 +354,8 @@ void usage(enum logcode F) +@@ -419,6 +423,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," --source-filter=COMMAND filter file through COMMAND at source\n"); + rprintf(F," --dest-filter=COMMAND filter file through COMMAND at destination\n"); rprintf(F," --protocol=NUM force an older protocol version to be used\n"); - #ifdef INET6 - rprintf(F," -4, --ipv4 prefer IPv4\n"); -@@ -377,6 +383,7 @@ static struct poptOption long_options[] - {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, + #ifdef ICONV_OPTION + rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filesnames\n"); +@@ -520,6 +526,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 }, + {"times-only", 0, POPT_ARG_NONE, ×_only , 0, 0, 0 }, - {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, - {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, -@@ -462,6 +469,8 @@ static struct poptOption long_options[] - {"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 }, - {"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0}, - {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 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 }, +@@ -619,6 +626,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 }, + {"source-filter", 0, POPT_ARG_STRING, &source_filter, 0, 0, 0 }, + {"dest-filter", 0, POPT_ARG_STRING, &dest_filter, 0, 0, 0 }, {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 }, {"checksum-seed", 0, POPT_ARG_INT, &checksum_seed, 0, 0, 0 }, - #ifdef INET6 -@@ -1195,6 +1204,16 @@ int parse_arguments(int *argc, const cha + {"server", 0, POPT_ARG_NONE, 0, OPT_SERVER, 0, 0 }, +@@ -1577,6 +1586,16 @@ int parse_arguments(int *argc_p, const c } } @@ -114,8 +130,8 @@ You should run "make proto" before running "make". if (files_from) { char *h, *p; int q; -@@ -1418,6 +1437,25 @@ void server_options(char **args,int *arg - args[ac++] = "--only-write-batch=X"; +@@ -1897,6 +1916,25 @@ void server_options(char **args, int *ar + } } + if (times_only && am_sender) @@ -137,12 +153,12 @@ You should run "make proto" before running "make". + args[ac++] = arg; + } + - if (size_only) - args[ac++] = "--size-only"; - ---- orig/pipe.c 2005-04-09 18:00:29 -+++ pipe.c 2005-08-17 07:24:44 -@@ -158,3 +158,79 @@ pid_t local_child(int argc, char **argv, + if (modify_window_set) { + if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) + goto oom; +--- old/pipe.c ++++ new/pipe.c +@@ -164,3 +164,77 @@ pid_t local_child(int argc, char **argv, return pid; } @@ -153,7 +169,7 @@ You should run "make proto" before running "make". + int pipefds[2]; + + if (verbose >= 2) -+ print_child_argv(command); ++ print_child_argv("opening connection using:", command); + + if (pipe(pipefds) < 0) { + rsyserr(FERROR, errno, "pipe"); @@ -178,8 +194,7 @@ You should run "make proto" before running "make". + if (blocking_io) + set_blocking(STDOUT_FILENO); + execvp(command[0], command); -+ rsyserr(FERROR, errno, "Failed to exec %s", -+ safe_fname(command[0])); ++ rsyserr(FERROR, errno, "Failed to exec %s", command[0]); + exit_cleanup(RERR_IPC); + } + @@ -198,7 +213,7 @@ You should run "make proto" before running "make". + pid_t pid; + + if (verbose >= 2) -+ print_child_argv(command); ++ print_child_argv("opening connection using:", command); + + pid = do_fork(); + if (pid == -1) { @@ -215,35 +230,34 @@ You should run "make proto" before running "make". + if (blocking_io) + set_blocking(STDOUT_FILENO); + execvp(command[0], command); -+ rsyserr(FERROR, errno, "Failed to exec %s", -+ safe_fname(command[0])); ++ rsyserr(FERROR, errno, "Failed to exec %s", command[0]); + exit_cleanup(RERR_IPC); + } + + return pid; +} ---- orig/receiver.c 2005-08-17 06:45:08 -+++ receiver.c 2005-08-17 07:57:33 -@@ -52,6 +52,7 @@ extern int inplace; - extern int delay_updates; +--- old/receiver.c ++++ new/receiver.c +@@ -52,6 +52,7 @@ extern int delay_updates; + extern mode_t orig_umask; extern struct stats stats; - extern char *log_format; -+extern char *dest_filter; extern char *tmpdir; ++extern char *dest_filter; extern char *partial_dir; extern char *basis_dir[]; -@@ -412,6 +413,8 @@ int recv_files(int f_in, struct file_lis - : !am_server && log_format_has_i; - int max_phase = protocol_version >= 29 ? 2 : 1; - int i, recv_ok; + extern struct file_list *cur_flist, *first_flist, *dir_flist; +@@ -357,6 +358,8 @@ int recv_files(int f_in, char *local_nam + const char *parent_dirname = ""; + #endif + int ndx, recv_ok; + pid_t pid = 0; + char *filter_argv[MAX_FILTER_ARGS + 1]; if (verbose > 2) - rprintf(FINFO,"recv_files(%d) starting\n",flist->count); -@@ -424,6 +427,23 @@ int recv_files(int f_in, struct file_lis - if (delay_updates) - init_delayed_bits(flist->count); + rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used); +@@ -366,6 +369,23 @@ int recv_files(int f_in, char *local_nam + + updating_basis = inplace; + if (dest_filter) { + char *p; @@ -265,23 +279,23 @@ You should run "make proto" before running "make". while (1) { cleanup_disable(); -@@ -662,6 +682,9 @@ int recv_files(int f_in, struct file_lis +@@ -663,6 +683,9 @@ int recv_files(int f_in, char *local_nam else if (!am_server && verbose && do_progress) - rprintf(FINFO, "%s\n", safe_fname(fname)); + rprintf(FINFO, "%s\n", fname); + if (dest_filter) + pid = run_filter(filter_argv, fd2, &fd2); + /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, file->length); -@@ -677,6 +700,16 @@ int recv_files(int f_in, struct file_lis + fname, fd2, F_LENGTH(file)); +@@ -677,6 +700,16 @@ int recv_files(int f_in, char *local_nam 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); @@ -290,11 +304,11 @@ You should run "make proto" before running "make". + } + if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { - finish_transfer(fname, fnametmp, file, recv_ok, 1); - if (partialptr != fname && fnamecmp == partialptr) { ---- orig/rsync.h 2005-08-17 06:45:08 -+++ rsync.h 2005-08-17 07:10:11 -@@ -103,6 +103,7 @@ + char *temp_copy_name; + if (partialptr == fname) +--- old/rsync.h ++++ new/rsync.h +@@ -128,6 +128,7 @@ #define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 @@ -302,9 +316,9 @@ You should run "make proto" before running "make". #define MAX_BASIS_DIRS 20 #define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100) ---- orig/rsync.yo 2005-08-17 06:45:08 -+++ rsync.yo 2005-08-17 07:08:21 -@@ -351,6 +351,7 @@ to the detailed description below for a +--- old/rsync.yo ++++ new/rsync.yo +@@ -386,6 +386,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 @@ -312,17 +326,17 @@ You should run "make proto" before running "make". --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 -@@ -383,6 +384,8 @@ to the detailed description below for a +@@ -425,6 +426,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 + --source-filter=COMMAND filter file through COMMAND at source + --dest-filter=COMMAND filter file through COMMAND at destination --protocol=NUM force an older protocol version to be used + --iconv=CONVERT_SPEC request charset conversion of filesnames --checksum-seed=NUM set block/file checksum seed (advanced) - -4, --ipv4 prefer IPv4 -@@ -1332,6 +1335,33 @@ file previously generated by bf(--write- - If em(FILE) is "-" the batch data will be read from standard input. +@@ -1959,6 +1962,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. +dit(bf(--source-filter=COMMAND)) This option allows the user to specify a @@ -355,20 +369,20 @@ You should run "make proto" before running "make". dit(bf(--protocol=NUM)) Force an older protocol version to be used. This is useful for creating a batch file that is compatible with an older version of rsync. For instance, if rsync 2.6.4 is being used with the ---- orig/sender.c 2005-07-28 01:46:25 -+++ sender.c 2005-08-17 07:40:49 -@@ -41,6 +41,7 @@ extern int write_batch; - extern struct stats stats; - extern struct file_list *the_file_list; - extern char *log_format; +--- old/sender.c ++++ new/sender.c +@@ -43,6 +43,7 @@ extern int do_progress; + extern int inplace; + extern int batch_fd; + extern int write_batch; +extern char *source_filter; + extern struct stats stats; + extern struct file_list *cur_flist, *first_flist, *dir_flist; - - /** -@@ -221,6 +222,26 @@ void send_files(struct file_list *flist, - : !am_server && log_format_has_i; +@@ -181,6 +182,26 @@ void send_files(int f_in, int f_out) + enum logcode log_code = log_before_transfer ? FLOG : FINFO; int f_xfer = write_batch < 0 ? batch_fd : f_out; - int i, j; + int ndx, j; + char *filter_argv[MAX_FILTER_ARGS + 1]; + char *tmp = 0; + int unlink_tmp = 0; @@ -392,16 +406,16 @@ You should run "make proto" before running "make". if (verbose > 2) rprintf(FINFO, "send_files starting\n"); -@@ -295,6 +316,7 @@ void send_files(struct file_list *flist, - return; +@@ -284,6 +305,7 @@ void send_files(int f_in, int f_out) + exit_cleanup(RERR_PROTOCOL); } + unlink_tmp = 0; fd = do_open(fname, O_RDONLY, 0); if (fd == -1) { if (errno == ENOENT) { -@@ -323,6 +345,33 @@ void send_files(struct file_list *flist, - return; +@@ -305,6 +327,33 @@ void send_files(int f_in, int f_out) + continue; } + if (source_filter) { @@ -418,7 +432,7 @@ You should run "make proto" before running "make". + 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", @@ -431,10 +445,10 @@ You should run "make proto" before running "make". + } + } + - 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); -@@ -367,6 +416,8 @@ void send_files(struct file_list *flist, + /* map the local file */ + if (do_fstat(fd, &st) != 0) { + io_error |= IOERR_GENERAL; +@@ -355,6 +404,8 @@ void send_files(int f_in, int f_out) } } close(fd);