X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/55c1a3b729d8b3324ecd7a863280f3402dfe4f05..3829f6bbbc5d3f38d7e26180e83f9bbf3e66e5e7:/source-filter_dest-filter.diff diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index 3ec3dea..5f53c69 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -23,10 +23,11 @@ Implementation details for the --source-filter and -dest-filter options: - 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 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 -@@ -119,7 +119,7 @@ pid_t wait_process(pid_t pid, int *statu +@@ -128,7 +128,7 @@ pid_t wait_process(pid_t pid, int *statu } /* Wait for a process to exit, calling io_flush while waiting. */ @@ -69,16 +70,16 @@ After applying 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 *log_format = NULL; - char *logfile_name = NULL; +@@ -150,6 +151,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 *rsync_path = RSYNC_PATH; char *backup_dir = NULL; char backup_dir_buf[MAXPATHLEN]; -@@ -337,6 +340,7 @@ void usage(enum logcode F) +@@ -340,6 +343,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"); @@ -86,7 +87,7 @@ After applying 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"); -@@ -373,6 +377,8 @@ void usage(enum logcode F) +@@ -377,6 +381,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"); @@ -95,7 +96,7 @@ After applying this patch, run these commands for a successful build: rprintf(F," --protocol=NUM force an older protocol version to be used\n"); #ifdef INET6 rprintf(F," -4, --ipv4 prefer IPv4\n"); -@@ -453,6 +459,7 @@ static struct poptOption long_options[] +@@ -460,6 +466,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 }, @@ -103,7 +104,7 @@ After applying 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 }, -@@ -528,6 +535,8 @@ static struct poptOption long_options[] +@@ -539,6 +546,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 }, @@ -112,7 +113,7 @@ After applying 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 }, -@@ -1406,6 +1415,16 @@ int parse_arguments(int *argc, const cha +@@ -1416,6 +1425,16 @@ int parse_arguments(int *argc, const cha } } @@ -129,7 +130,7 @@ After applying this patch, run these commands for a successful build: if (files_from) { char *h, *p; int q; -@@ -1671,6 +1690,25 @@ void server_options(char **args,int *arg +@@ -1692,6 +1711,25 @@ void server_options(char **args,int *arg args[ac++] = "--size-only"; } @@ -157,7 +158,7 @@ After applying this patch, run these commands for a successful build: goto oom; --- old/pipe.c +++ new/pipe.c -@@ -159,3 +159,77 @@ pid_t local_child(int argc, char **argv, +@@ -165,3 +165,77 @@ pid_t local_child(int argc, char **argv, return pid; } @@ -237,26 +238,26 @@ After applying this patch, run these commands for a successful build: +} --- old/receiver.c +++ new/receiver.c -@@ -49,6 +49,7 @@ extern int inplace; +@@ -49,6 +49,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[]; -@@ -345,6 +346,8 @@ int recv_files(int f_in, struct file_lis - int itemizing = am_server ? logfile_format_has_i : log_format_has_i; +@@ -350,6 +351,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; - int i, recv_ok; + 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); -@@ -357,6 +360,23 @@ int recv_files(int f_in, struct file_lis - if (delay_updates) - delayed_bits = bitbag_create(flist->count); + rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->count); +@@ -359,6 +362,23 @@ int recv_files(int f_in, char *local_nam + + updating_basis = inplace; + if (dest_filter) { + char *p; @@ -278,7 +279,7 @@ After applying this patch, run these commands for a successful build: while (1) { cleanup_disable(); -@@ -599,6 +619,9 @@ int recv_files(int f_in, struct file_lis +@@ -619,6 +639,9 @@ int recv_files(int f_in, char *local_nam else if (!am_server && verbose && do_progress) rprintf(FINFO, "%s\n", fname); @@ -287,8 +288,8 @@ After applying 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); -@@ -614,6 +637,16 @@ int recv_files(int f_in, struct file_lis + fname, fd2, F_LENGTH(file)); +@@ -633,6 +656,16 @@ int recv_files(int f_in, char *local_nam exit_cleanup(RERR_FILEIO); } @@ -307,7 +308,7 @@ After applying this patch, run these commands for a successful build: if (partialptr == fname) --- old/rsync.h +++ new/rsync.h -@@ -103,6 +103,7 @@ +@@ -119,6 +119,7 @@ #define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 @@ -317,7 +318,7 @@ After applying this patch, run these commands for a successful build: --- old/rsync.yo +++ new/rsync.yo -@@ -359,6 +359,7 @@ to the detailed description below for a +@@ -361,6 +361,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 @@ -325,7 +326,7 @@ After applying 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 -@@ -395,6 +396,8 @@ to the detailed description below for a +@@ -398,6 +399,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 @@ -334,7 +335,7 @@ After applying this patch, run these commands for a successful build: --protocol=NUM force an older protocol version to be used --checksum-seed=NUM set block/file checksum seed (advanced) -4, --ipv4 prefer IPv4 -@@ -1732,6 +1735,33 @@ file previously generated by bf(--write- +@@ -1774,6 +1777,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. @@ -370,18 +371,18 @@ After applying 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 -@@ -44,6 +44,7 @@ extern int write_batch; +@@ -44,6 +44,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 struct file_list *cur_flist, *first_flist; +extern char *source_filter; - + extern char *stdout_format; /** -@@ -221,6 +222,26 @@ void send_files(struct file_list *flist, - int itemizing = am_server ? logfile_format_has_i : log_format_has_i; +@@ -176,6 +177,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; @@ -405,16 +406,16 @@ After applying this patch, run these commands for a successful build: if (verbose > 2) rprintf(FINFO, "send_files starting\n"); -@@ -295,6 +316,7 @@ void send_files(struct file_list *flist, - return; +@@ -266,6 +287,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; +@@ -296,6 +318,33 @@ void send_files(int f_in, int f_out) + exit_cleanup(RERR_PROTOCOL); } + if (source_filter) { @@ -447,7 +448,7 @@ After applying 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); -@@ -365,6 +414,8 @@ void send_files(struct file_list *flist, +@@ -337,6 +386,8 @@ void send_files(int f_in, int f_out) } } close(fd);