- 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 <patches/source-filter_dest-filter.diff
+ ./prepare-source
+ ./configure (optional if already run)
+ make
+
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -64,6 +64,7 @@ extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
+extern int times_only;
extern int size_only;
extern OFF_T max_size;
- extern int io_error;
-@@ -360,7 +361,7 @@ void itemize(struct file_struct *file, i
+ extern OFF_T min_size;
+@@ -523,7 +524,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
/* Perform our quick-check heuristic for determining if a file is unchanged. */
- static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
-- if (st->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-08-27 21:11:26
-+++ options.c 2005-08-27 21:27:17
-@@ -90,6 +90,7 @@ int keep_partial = 0;
- int safe_symlinks = 0;
+diff --git a/main.c b/main.c
+--- a/main.c
++++ b/main.c
+@@ -153,7 +153,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;
-@@ -138,6 +139,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;
-@@ -316,6 +319,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");
-@@ -347,6 +351,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");
-@@ -413,6 +419,7 @@ static struct poptOption long_options[]
- {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 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, &one_file_system, 0, 0, 0 },
- {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
- {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 },
-@@ -481,6 +488,8 @@ static struct poptOption long_options[]
+ {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
+ {"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 },
-@@ -1219,6 +1228,16 @@ int parse_arguments(int *argc, const cha
+@@ -2201,6 +2210,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1442,6 +1461,25 @@ void server_options(char **args,int *arg
- args[ac++] = "--only-write-batch=X";
- }
+@@ -2545,6 +2564,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";
+ 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;
+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;
}
+{
+ 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");
+ 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);
+ }
+
+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) {
+ 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;
+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[];
-@@ -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 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);
-@@ -424,6 +427,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;
while (1) {
cleanup_disable();
-@@ -662,6 +682,9 @@ int recv_files(int f_in, struct file_lis
- else if (!am_server && verbose && do_progress)
- rprintf(FINFO, "%s\n", safe_fname(fname));
+@@ -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)
+ 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));
+@@ -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);
+ }
+
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 @@
+ 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
#define MAX_BASIS_DIRS 20
#define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100)
---- orig/rsync.yo 2005-08-27 21:05:12
-+++ 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
-@@ -381,6 +382,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
-@@ -1346,6 +1349,33 @@ file previously generated by bf(--write-
- If em(FILE) is "-" the batch data will be read from standard input.
+@@ -2335,6 +2338,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.
+dit(bf(--source-filter=COMMAND)) This option allows the user to specify a
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;
+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;
-
-
- /**
-@@ -221,6 +222,26 @@ void send_files(struct file_list *flist,
- : !am_server && log_format_has_i;
+ extern BOOL we_send_keepalive_messages;
+ extern struct stats stats;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+@@ -178,6 +179,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;
+ }
+ }
- if (verbose > 2)
+ if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
-@@ -295,6 +316,7 @@ void send_files(struct file_list *flist,
- return;
+@@ -311,6 +332,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;
+@@ -332,6 +354,33 @@ void send_files(int f_in, int f_out)
+ continue;
}
+ if (source_filter) {
+ 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",
+ }
+ }
+
- 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;
+@@ -382,6 +431,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff