X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/03019e41fc3299020c8acdda06cf57a1e2c57a25..d705d4dd33c2cd5a83d772df98c7b3ff5319af34:/source-filter_dest-filter.diff diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index 833d749..4f94491 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -32,7 +32,7 @@ To use this patch, run these commands for a successful build: --- old/generator.c +++ new/generator.c -@@ -60,6 +60,7 @@ extern int append_mode; +@@ -61,6 +61,7 @@ extern int append_mode; extern int make_backups; extern int csum_length; extern int ignore_times; @@ -40,18 +40,18 @@ To use this patch, run these commands for a successful build: extern int size_only; extern OFF_T max_size; extern OFF_T min_size; -@@ -378,7 +379,7 @@ void itemize(struct file_struct *file, i +@@ -620,7 +621,7 @@ void itemize(const char *fnamecmp, struc /* Perform our quick-check heuristic for determining if a file is unchanged. */ 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 --- old/main.c +++ new/main.c -@@ -122,7 +122,7 @@ pid_t wait_process(pid_t pid, int *statu +@@ -127,7 +127,7 @@ pid_t wait_process(pid_t pid, int *statu } /* Wait for a process to exit, calling io_flush while waiting. */ @@ -62,7 +62,7 @@ To use this patch, run these commands for a successful build: int status; --- old/options.c +++ new/options.c -@@ -99,6 +99,7 @@ int keep_partial = 0; +@@ -101,6 +101,7 @@ int keep_partial = 0; int safe_symlinks = 0; int copy_unsafe_links = 0; int size_only = 0; @@ -70,7 +70,7 @@ To use this patch, run these commands for a successful build: int daemon_bwlimit = 0; int bwlimit = 0; int fuzzy_basis = 0; -@@ -151,6 +152,8 @@ char *logfile_name = NULL; +@@ -152,6 +153,8 @@ char *logfile_name = NULL; char *logfile_format = NULL; char *stdout_format = NULL; char *password_file = NULL; @@ -79,7 +79,7 @@ To use this patch, run these commands for a successful build: char *rsync_path = RSYNC_PATH; char *backup_dir = NULL; char backup_dir_buf[MAXPATHLEN]; -@@ -343,6 +346,7 @@ void usage(enum logcode F) +@@ -370,6 +373,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"); @@ -87,16 +87,16 @@ To use this patch, run these commands for a successful build: 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"); -@@ -380,6 +384,8 @@ void usage(enum logcode F) +@@ -407,6 +411,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"); -@@ -463,6 +469,7 @@ static struct poptOption long_options[] + #ifdef ICONV_OPTION + rprintf(F," --iconv=CONVERT_SPEC request charset conversion of filesnames\n"); +@@ -506,6 +512,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 }, @@ -104,7 +104,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -541,6 +548,8 @@ static struct poptOption long_options[] +@@ -601,6 +608,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 }, @@ -113,7 +113,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1410,6 +1419,16 @@ int parse_arguments(int *argc, const cha +@@ -1531,6 +1540,16 @@ int parse_arguments(int *argc, const cha } } @@ -130,7 +130,7 @@ To use this patch, run these commands for a successful build: if (files_from) { char *h, *p; int q; -@@ -1676,6 +1695,25 @@ void server_options(char **args,int *arg +@@ -1840,6 +1859,25 @@ void server_options(char **args,int *arg args[ac++] = "--size-only"; } @@ -158,7 +158,7 @@ To use this patch, run these commands for a successful build: goto oom; --- old/pipe.c +++ new/pipe.c -@@ -166,3 +166,77 @@ pid_t local_child(int argc, char **argv, +@@ -163,3 +163,77 @@ pid_t local_child(int argc, char **argv, return pid; } @@ -238,24 +238,24 @@ To use this patch, run these commands for a successful build: +} --- old/receiver.c +++ new/receiver.c -@@ -48,6 +48,7 @@ extern int checksum_seed; - extern int inplace; - extern int delay_updates; +@@ -51,6 +51,7 @@ extern int delay_updates; + extern mode_t orig_umask; extern struct stats stats; -+extern char *dest_filter; - extern char *stdout_format; extern char *tmpdir; ++extern char *dest_filter; extern char *partial_dir; -@@ -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; + extern char *basis_dir[]; + extern struct file_list *cur_flist, *first_flist, *dir_flist; +@@ -354,6 +355,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); -@@ -365,6 +368,23 @@ int recv_files(int f_in, struct file_lis + rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used); +@@ -363,6 +366,23 @@ int recv_files(int f_in, char *local_nam updating_basis = inplace; @@ -279,7 +279,7 @@ To use this patch, run these commands for a successful build: while (1) { cleanup_disable(); -@@ -610,6 +630,9 @@ int recv_files(int f_in, struct file_lis +@@ -658,6 +678,9 @@ int recv_files(int f_in, char *local_nam else if (!am_server && verbose && do_progress) rprintf(FINFO, "%s\n", fname); @@ -288,8 +288,8 @@ To use this patch, run these commands for a successful build: + /* recv file data */ recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size, - fname, fd2, file->length); -@@ -624,6 +647,16 @@ int recv_files(int f_in, struct file_lis + fname, fd2, F_LENGTH(file)); +@@ -672,6 +695,16 @@ int recv_files(int f_in, char *local_nam exit_cleanup(RERR_FILEIO); } @@ -308,7 +308,7 @@ To use this patch, run these commands for a successful build: if (partialptr == fname) --- old/rsync.h +++ new/rsync.h -@@ -104,6 +104,7 @@ +@@ -126,6 +126,7 @@ #define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 @@ -318,7 +318,7 @@ To use this patch, run these commands for a successful build: --- old/rsync.yo +++ new/rsync.yo -@@ -360,6 +360,7 @@ to the detailed description below for a +@@ -370,6 +370,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 @@ -326,16 +326,16 @@ To use this patch, run these commands for a successful build: --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 -@@ -397,6 +398,8 @@ to the detailed description below for a +@@ -407,6 +408,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 + --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 filesnames --checksum-seed=NUM set block/file checksum seed (advanced) - -4, --ipv4 prefer IPv4 -@@ -1759,6 +1762,33 @@ file previously generated by bf(--write- +@@ -1865,6 +1868,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. @@ -371,18 +371,18 @@ To use this patch, run these commands for a successful build: version of rsync. For instance, if rsync 2.6.4 is being used with the --- old/sender.c +++ new/sender.c -@@ -43,6 +43,7 @@ extern int batch_fd; +@@ -42,6 +42,7 @@ extern int do_progress; + extern int inplace; + extern int batch_fd; extern int write_batch; - extern struct stats stats; - extern struct file_list *the_file_list; +extern char *source_filter; - extern char *stdout_format; - + extern struct stats stats; + extern struct file_list *cur_flist, *first_flist, *dir_flist; -@@ -224,6 +225,26 @@ void send_files(struct file_list *flist, +@@ -180,6 +181,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; @@ -406,16 +406,16 @@ To use this patch, run these commands for a successful build: if (verbose > 2) rprintf(FINFO, "send_files starting\n"); -@@ -297,6 +318,7 @@ void send_files(struct file_list *flist, - return; +@@ -283,6 +304,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) { -@@ -325,6 +347,33 @@ void send_files(struct file_list *flist, - return; +@@ -313,6 +335,33 @@ void send_files(int f_in, int f_out) + exit_cleanup(RERR_PROTOCOL); } + if (source_filter) { @@ -448,7 +448,7 @@ To use this patch, run these commands for a successful build: 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); -@@ -366,6 +415,8 @@ void send_files(struct file_list *flist, +@@ -354,6 +403,8 @@ void send_files(int f_in, int f_out) } } close(fd);