- If the COMMAND contains single quotes, option-passing breaks. (Needs
to be fixed.)
-After applying this patch, run these commands for a successful build:
+To use this patch, run these commands for a successful build:
+ patch -p1 <patches/source-filter_dest-filter.diff
./prepare-source
- ./configure (optional if already run)
+ ./configure (optional if already run)
make
---- orig/generator.c 2006-02-05 06:40:40
-+++ generator.c 2005-08-17 07:28:01
-@@ -61,6 +61,7 @@ extern int append_mode;
+--- old/generator.c
++++ new/generator.c
+@@ -60,6 +60,7 @@ extern int append_mode;
extern int make_backups;
extern int csum_length;
extern int ignore_times;
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
+@@ -378,7 +379,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)
{
return 0;
/* if always checksum is set then we use the checksum instead
---- orig/options.c 2006-02-03 23:51:57
-+++ options.c 2006-01-21 08:09:48
-@@ -98,6 +98,7 @@ int keep_partial = 0;
+--- old/main.c
++++ new/main.c
+@@ -122,7 +122,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;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
int size_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
-@@ -147,6 +148,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 *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;
-@@ -331,6 +334,7 @@ void usage(enum logcode F)
+ char backup_dir_buf[MAXPATHLEN];
+@@ -343,6 +346,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");
-@@ -366,6 +370,8 @@ void usage(enum logcode F)
+@@ -380,6 +384,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");
-@@ -443,6 +449,7 @@ static struct poptOption long_options[]
+@@ -463,6 +469,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 },
{"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 },
-@@ -516,6 +523,8 @@ static struct poptOption long_options[]
+@@ -541,6 +548,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 },
{"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 },
-@@ -1380,6 +1389,16 @@ int parse_arguments(int *argc, const cha
+@@ -1410,6 +1419,16 @@ int parse_arguments(int *argc, const cha
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1640,6 +1659,25 @@ void server_options(char **args,int *arg
- args[ac++] = "--super";
+@@ -1676,6 +1695,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 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;
+--- old/pipe.c
++++ new/pipe.c
+@@ -166,3 +166,77 @@ pid_t local_child(int argc, char **argv,
return pid;
}
+
+ return pid;
+}
---- orig/receiver.c 2006-01-31 02:30:18
-+++ receiver.c 2005-08-17 07:57:33
-@@ -53,6 +53,7 @@ extern int inplace;
+--- old/receiver.c
++++ new/receiver.c
+@@ -48,6 +48,7 @@ extern int checksum_seed;
+ extern int inplace;
extern int delay_updates;
extern struct stats stats;
- extern char *log_format;
+extern char *dest_filter;
+ extern char *stdout_format;
extern char *tmpdir;
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;
+@@ -351,6 +352,8 @@ int recv_files(int f_in, struct file_lis
+ enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int max_phase = protocol_version >= 29 ? 2 : 1;
int i, recv_ok;
+ pid_t pid = 0;
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 (delay_updates)
- init_delayed_bits(flist->count);
+@@ -365,6 +368,23 @@ int recv_files(int f_in, struct file_lis
+
+ updating_basis = inplace;
+ if (dest_filter) {
+ char *p;
while (1) {
cleanup_disable();
-@@ -665,6 +685,9 @@ int recv_files(int f_in, struct file_lis
+@@ -610,6 +630,9 @@ int recv_files(int f_in, struct file_lis
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
/* 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
+@@ -624,6 +647,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);
+ }
+
if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
- if (partialptr == fname || *partial_dir == '/')
- partialptr = NULL;
---- orig/rsync.h 2006-02-03 20:00:36
-+++ 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
+@@ -104,6 +104,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 2006-02-05 15:31:49
-+++ rsync.yo 2005-08-17 07:08:21
-@@ -355,6 +355,7 @@ to the detailed description below for a
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -360,6 +360,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
-@@ -390,6 +391,8 @@ to the detailed description below for a
+@@ -397,6 +398,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
-@@ -1598,6 +1601,33 @@ file previously generated by bf(--write-
+@@ -1759,6 +1762,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(--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;
+--- old/sender.c
++++ new/sender.c
+@@ -43,6 +43,7 @@ extern int batch_fd;
+ extern int write_batch;
extern struct stats stats;
extern struct file_list *the_file_list;
- extern char *log_format;
+extern char *source_filter;
+ extern char *stdout_format;
- /**
-@@ -219,6 +220,26 @@ void send_files(struct file_list *flist,
- : !am_server && log_format_has_i;
+@@ -224,6 +225,26 @@ void send_files(struct file_list *flist,
+ enum logcode log_code = log_before_transfer ? FLOG : FINFO;
int f_xfer = write_batch < 0 ? batch_fd : f_out;
int i, j;
+ char *filter_argv[MAX_FILTER_ARGS + 1];
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
-@@ -293,6 +314,7 @@ void send_files(struct file_list *flist,
+@@ -297,6 +318,7 @@ void send_files(struct file_list *flist,
return;
}
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
-@@ -321,6 +343,33 @@ void send_files(struct file_list *flist,
+@@ -325,6 +347,33 @@ void send_files(struct file_list *flist,
return;
}
+ 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);
-@@ -363,6 +412,8 @@ void send_files(struct file_list *flist,
+@@ -366,6 +415,8 @@ void send_files(struct file_list *flist,
}
}
close(fd);
git.samba.org / rsync-patches.git / blobdiff