- 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
+
+--- old/generator.c
++++ new/generator.c
+@@ -62,6 +62,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;
+@@ -618,7 +619,7 @@ void itemize(const char *fnamecmp, struc
/* 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-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
+@@ -127,7 +127,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
+@@ -101,6 +101,7 @@ int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
int size_only = 0;
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;
+@@ -152,6 +153,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];
+@@ -356,6 +359,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");
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)
+@@ -393,6 +397,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");
-@@ -377,6 +383,7 @@ static struct poptOption long_options[]
- {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
+@@ -486,6 +492,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 },
+@@ -565,6 +572,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 },
+@@ -1467,6 +1476,16 @@ int parse_arguments(int *argc, const cha
}
}
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";
+@@ -1751,6 +1770,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";
-
---- 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;
}
+ 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);
+ }
+
+ 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;
- extern struct stats stats;
- extern char *log_format;
-+extern char *dest_filter;
+--- old/receiver.c
++++ new/receiver.c
+@@ -54,6 +54,7 @@ extern struct stats stats;
extern char *tmpdir;
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 *dest_filter;
+ extern struct file_list *cur_flist, *first_flist;
+ extern struct filter_list_struct server_filter_list;
+
+@@ -355,6 +356,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->count);
+@@ -364,6 +367,23 @@ int recv_files(int f_in, char *local_nam
+
+ updating_basis = inplace;
+ if (dest_filter) {
+ char *p;
while (1) {
cleanup_disable();
-@@ -662,6 +682,9 @@ int recv_files(int f_in, struct file_lis
+@@ -644,6 +664,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));
+@@ -658,6 +681,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);
+ }
+
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
+@@ -120,6 +120,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-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
+@@ -363,6 +363,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
--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
+@@ -400,6 +401,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
-@@ -1332,6 +1335,33 @@ file previously generated by bf(--write-
- If em(FILE) is "-" the batch data will be read from standard input.
+@@ -1823,6 +1826,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
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;
-
- /**
-@@ -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;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
-@@ -295,6 +316,7 @@ void send_files(struct file_list *flist,
- return;
+@@ -281,6 +302,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;
+@@ -311,6 +333,33 @@ void send_files(int f_in, int f_out)
+ exit_cleanup(RERR_PROTOCOL);
}
+ 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,
+@@ -352,6 +401,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);