X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e0e47893064c8fd38b96bec679416b3e562df485..5214a41bbae94607b196b199b483710e1babf292:/source-filter_dest-filter.diff diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index c5e9f47..65f77cd 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -23,11 +23,18 @@ 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 2006-01-20 21:12:17 -+++ generator.c 2005-08-17 07:28:01 -@@ -59,6 +59,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 2006-01-21 07:55:00 -+++ options.c 2006-01-21 08:09:48 -@@ -93,6 +93,7 @@ int keep_partial = 0; - int safe_symlinks = 0; +diff --git a/main.c b/main.c +--- a/main.c ++++ b/main.c +@@ -149,7 +149,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags) + } + + /* 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; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -105,6 +105,7 @@ int safe_symlinks = 0; int copy_unsafe_links = 0; + int munge_symlinks = 0; int size_only = 0; +int times_only = 0; int daemon_bwlimit = 0; int bwlimit = 0; int fuzzy_basis = 0; -@@ -142,6 +143,8 @@ char *basis_dir[MAX_BASIS_DIRS+1]; - char *config_file = NULL; - char *shell_cmd = NULL; - char *log_format = NULL; +@@ -164,6 +165,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; -@@ -321,6 +324,7 @@ void usage(enum logcode F) - rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); + char backup_dir_buf[MAXPATHLEN]; +@@ -740,6 +743,7 @@ void usage(enum logcode F) rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); + rprintf(F," -M, --remote-option=OPTION send OPTION to the remote side only\n"); rprintf(F," --size-only skip files that match in size\n"); + rprintf(F," --times-only skip files that match in mod-time\n"); 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"); -@@ -355,6 +359,8 @@ void usage(enum logcode F) +@@ -779,6 +783,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"); -@@ -425,6 +431,7 @@ static struct poptOption long_options[] - {"chmod", 0, POPT_ARG_STRING, &chmod_mode, 0, 0, 0 }, + #ifdef ICONV_OPTION + rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filenames\n"); +@@ -888,6 +894,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 }, {"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 }, -@@ -496,6 +503,8 @@ static struct poptOption long_options[] + {"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, + {"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, +@@ -1008,6 +1015,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 }, + {"remote-option", 'M', POPT_ARG_STRING, 0, 'M', 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, &am_server, 0, 0, 0 }, -@@ -1331,6 +1340,16 @@ int parse_arguments(int *argc, const cha +@@ -2186,6 +2195,16 @@ int parse_arguments(int *argc_p, const char ***argv_p) } } @@ -114,9 +134,9 @@ You should run "make proto" before running "make". if (files_from) { char *h, *p; int q; -@@ -1570,6 +1589,25 @@ void server_options(char **args,int *arg - args[ac++] = "--only-write-batch=X"; - } +@@ -2530,6 +2549,25 @@ void server_options(char **args, int *argc_p) + else if (missing_args == 1 && !am_sender) + args[ac++] = "--ignore-missing-args"; + if (times_only && am_sender) + args[ac++] = "--times-only"; @@ -137,12 +157,13 @@ You should run "make proto" before running "make". + args[ac++] = arg; + } + - if (size_only) - args[ac++] = "--size-only"; - ---- orig/pipe.c 2006-01-21 08:03:40 -+++ pipe.c 2006-01-14 08:34:59 -@@ -157,3 +157,77 @@ pid_t local_child(int argc, char **argv, + if (modify_window_set) { + if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) + goto oom; +diff --git a/pipe.c b/pipe.c +--- a/pipe.c ++++ b/pipe.c +@@ -180,3 +180,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out, return pid; } @@ -151,9 +172,9 @@ You should run "make proto" before running "make". +{ + pid_t pid; + int pipefds[2]; -+ -+ if (verbose >= 2) -+ print_child_argv(command); ++ ++ if (DEBUG_GTE(CMD, 1)) ++ print_child_argv("opening connection using:", command); + + if (pipe(pipefds) < 0) { + rsyserr(FERROR, errno, "pipe"); @@ -195,9 +216,9 @@ You should run "make proto" before running "make". +pid_t run_filter_on_file(char *command[], int out, int in) +{ + pid_t pid; -+ -+ if (verbose >= 2) -+ print_child_argv(command); ++ ++ if (DEBUG_GTE(CMD, 1)) ++ print_child_argv("opening connection using:", command); + + pid = do_fork(); + if (pid == -1) { @@ -220,28 +241,29 @@ You should run "make proto" before running "make". + + return pid; +} ---- orig/receiver.c 2006-01-14 20:27:09 -+++ receiver.c 2005-08-17 07:57:33 -@@ -53,6 +53,7 @@ extern int inplace; - extern int delay_updates; +diff --git a/receiver.c b/receiver.c +--- a/receiver.c ++++ b/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[]; -@@ -411,6 +412,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 char *basis_dir[MAX_BASIS_DIRS+1]; + extern char sender_file_sum[MAX_DIGEST_LEN]; +@@ -475,6 +476,8 @@ int recv_files(int f_in, int f_out, char *local_name) + 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); -@@ -423,6 +426,23 @@ int recv_files(int f_in, struct file_lis + if (DEBUG_GTE(RECV, 1)) + rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used); +@@ -482,6 +485,23 @@ int recv_files(int f_in, int f_out, char *local_name) if (delay_updates) - init_delayed_bits(flist->count); + delayed_bits = bitbag_create(cur_flist->used + 1); + if (dest_filter) { + char *p; @@ -263,8 +285,8 @@ You should run "make proto" before running "make". while (1) { cleanup_disable(); -@@ -665,6 +685,9 @@ int recv_files(int f_in, struct file_lis - else if (!am_server && verbose && do_progress) +@@ -777,6 +797,9 @@ int recv_files(int f_in, int f_out, char *local_name) + else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1)) rprintf(FINFO, "%s\n", fname); + if (dest_filter) @@ -272,14 +294,14 @@ You should run "make proto" before running "make". + /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, file->length); -@@ -680,6 +703,16 @@ int recv_files(int f_in, struct file_lis + fname, fd2, F_LENGTH(file)); +@@ -791,6 +814,16 @@ int recv_files(int f_in, int f_out, char *local_name) 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); @@ -288,11 +310,12 @@ 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 2006-01-14 20:27:10 -+++ rsync.h 2005-08-17 07:10:11 -@@ -103,6 +103,7 @@ + if (partialptr == fname) + partialptr = NULL; +diff --git a/rsync.h b/rsync.h +--- a/rsync.h ++++ b/rsync.h +@@ -143,6 +143,7 @@ #define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 @@ -300,26 +323,27 @@ 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 2006-01-21 08:12:23 -+++ rsync.yo 2005-08-17 07:08:21 -@@ -350,6 +350,7 @@ to the detailed description below for a - --timeout=TIME set I/O timeout in seconds +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -394,6 +394,7 @@ to the detailed description below for a complete description. verb( + --contimeout=SECONDS set daemon connection timeout in seconds -I, --ignore-times don't skip files that match size and time --size-only skip files that match in size + --times-only skip files that match in mod-time --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 -@@ -384,6 +385,8 @@ to the detailed description below for a +@@ -434,6 +435,8 @@ to the detailed description below for a complete description. verb( --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 filenames --checksum-seed=NUM set block/file checksum seed (advanced) - -4, --ipv4 prefer IPv4 -@@ -1430,6 +1433,33 @@ file previously generated by bf(--write- +@@ -2321,6 +2324,33 @@ file previously generated by bf(--write-batch). If em(FILE) is bf(-), the batch data will be read from standard input. See the "BATCH MODE" section for details. @@ -353,20 +377,21 @@ 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 2006-01-14 20:27:10 -+++ 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; +diff --git a/sender.c b/sender.c +--- a/sender.c ++++ b/sender.c +@@ -43,6 +43,7 @@ extern int inplace; + extern int batch_fd; + extern int write_batch; + extern int file_old_total; +extern char *source_filter; + extern struct stats stats; + extern struct file_list *cur_flist, *first_flist, *dir_flist; - - /** -@@ -219,6 +220,26 @@ void send_files(struct file_list *flist, - : !am_server && log_format_has_i; +@@ -177,6 +178,26 @@ void send_files(int f_in, int f_out) int f_xfer = write_batch < 0 ? batch_fd : f_out; - int i, j; + int save_io_error = io_error; + int ndx, j; + char *filter_argv[MAX_FILTER_ARGS + 1]; + char *tmp = 0; + int unlink_tmp = 0; @@ -388,18 +413,18 @@ You should run "make proto" before running "make". + } + } - if (verbose > 2) + if (DEBUG_GTE(SEND, 1)) rprintf(FINFO, "send_files starting\n"); -@@ -293,6 +314,7 @@ void send_files(struct file_list *flist, - return; +@@ -310,6 +331,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) { -@@ -321,6 +343,33 @@ void send_files(struct file_list *flist, - return; +@@ -331,6 +353,33 @@ void send_files(int f_in, int f_out) + continue; } + if (source_filter) { @@ -416,7 +441,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", @@ -429,10 +454,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); -@@ -363,6 +412,8 @@ void send_files(struct file_list *flist, + /* map the local file */ + if (do_fstat(fd, &st) != 0) { + io_error |= IOERR_GENERAL; +@@ -381,6 +430,8 @@ void send_files(int f_in, int f_out) } } close(fd);