./configure (optional if already run)
make
---- old/generator.c
-+++ new/generator.c
-@@ -61,6 +61,7 @@ extern int append_mode;
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+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 size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -571,7 +572,7 @@ void itemize(struct file_struct *file, i
+@@ -524,7 +525,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. */
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
---- old/main.c
-+++ new/main.c
-@@ -128,7 +128,7 @@ pid_t wait_process(pid_t pid, int *statu
+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. */
{
pid_t waited_pid;
int status;
---- old/options.c
-+++ new/options.c
-@@ -99,6 +99,7 @@ int keep_partial = 0;
- int safe_symlinks = 0;
+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;
-@@ -150,6 +151,8 @@ char *logfile_name = NULL;
+@@ -164,6 +165,8 @@ char *logfile_name = NULL;
char *logfile_format = NULL;
char *stdout_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_PATH;
char *backup_dir = NULL;
char backup_dir_buf[MAXPATHLEN];
-@@ -340,6 +343,7 @@ void usage(enum logcode F)
- rprintf(F," --timeout=TIME set I/O timeout in seconds\n");
+@@ -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");
-@@ -377,6 +381,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");
-@@ -460,6 +466,7 @@ static struct poptOption long_options[]
+ #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 },
-@@ -539,6 +546,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, 0, OPT_SERVER, 0, 0 },
-@@ -1416,6 +1425,16 @@ int parse_arguments(int *argc, const cha
+@@ -2186,6 +2195,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1692,6 +1711,25 @@ void server_options(char **args,int *arg
- args[ac++] = "--size-only";
- }
+@@ -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";
if (modify_window_set) {
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
---- old/pipe.c
-+++ new/pipe.c
-@@ -165,3 +165,77 @@ pid_t local_child(int argc, char **argv,
+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");
+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) {
+
+ return pid;
+}
---- old/receiver.c
-+++ new/receiver.c
-@@ -52,6 +52,7 @@ extern struct stats stats;
+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 *tmpdir;
- extern char *partial_dir;
- extern char *basis_dir[];
+extern char *dest_filter;
- extern struct file_list *cur_flist, *first_flist;
- extern struct filter_list_struct server_filter_list;
-
-@@ -349,6 +350,8 @@ int recv_files(int f_in, char *local_nam
- enum logcode log_code = log_before_transfer ? FLOG : FINFO;
- int max_phase = protocol_version >= 29 ? 2 : 1;
+ extern char *partial_dir;
+ 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", cur_flist->count);
-@@ -358,6 +361,23 @@ int recv_files(int f_in, char *local_nam
-
- updating_basis = inplace;
+ 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)
+ delayed_bits = bitbag_create(cur_flist->used + 1);
+ if (dest_filter) {
+ char *p;
while (1) {
cleanup_disable();
-@@ -620,6 +640,9 @@ int recv_files(int f_in, char *local_nam
- 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)
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, F_LENGTH(file));
-@@ -634,6 +657,16 @@ int recv_files(int f_in, char *local_nam
+@@ -791,6 +814,16 @@ int recv_files(int f_in, int f_out, char *local_name)
exit_cleanup(RERR_FILEIO);
}
+ }
+
if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
- char *temp_copy_name;
if (partialptr == fname)
---- old/rsync.h
-+++ new/rsync.h
-@@ -119,6 +119,7 @@
+ 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)
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -361,6 +361,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
-@@ -398,6 +399,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
-@@ -1804,6 +1807,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.
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
---- old/sender.c
-+++ new/sender.c
-@@ -42,6 +42,7 @@ extern int do_progress;
- extern int inplace;
+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;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -175,6 +176,26 @@ void send_files(int f_in, int f_out)
- enum logcode log_code = log_before_transfer ? FLOG : FINFO;
+@@ -177,6 +178,26 @@ void send_files(int f_in, int f_out)
int f_xfer = write_batch < 0 ? batch_fd : f_out;
+ int save_io_error = io_error;
int ndx, j;
+ char *filter_argv[MAX_FILTER_ARGS + 1];
+ char *tmp = 0;
+ }
+ }
- if (verbose > 2)
+ if (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
-@@ -265,6 +286,7 @@ void send_files(int f_in, int f_out)
+@@ -310,6 +331,7 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
-@@ -295,6 +317,33 @@ void send_files(int f_in, int f_out)
- exit_cleanup(RERR_PROTOCOL);
+@@ -331,6 +353,33 @@ void send_files(int f_in, int f_out)
+ continue;
}
+ if (source_filter) {
+ }
+ }
+
- 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);
-@@ -336,6 +385,8 @@ void send_files(int f_in, int f_out)
+ /* 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);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff