X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/afcb578c53a1c5579d48336e2197e476cead7057..b32178cc0c3f7e178c8ce4cc7316fe5511fc251a:/source-filter_dest-filter.diff diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff index a6c6e54..833d749 100644 --- a/source-filter_dest-filter.diff +++ b/source-filter_dest-filter.diff @@ -23,15 +23,16 @@ 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 = 29 ? 2 : 1; int i, recv_ok; + pid_t pid = 0; @@ -243,9 +255,9 @@ After applying this patch, run these commands for a successful build: if (verbose > 2) rprintf(FINFO,"recv_files(%d) starting\n",flist->count); -@@ -362,6 +365,23 @@ int recv_files(int f_in, struct file_lis - if (delay_updates) - delayed_bits = bitbag_create(flist->count); +@@ -365,6 +368,23 @@ int recv_files(int f_in, struct file_lis + + updating_basis = inplace; + if (dest_filter) { + char *p; @@ -267,7 +279,7 @@ After applying this patch, run these commands for a successful build: while (1) { cleanup_disable(); -@@ -604,6 +624,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); @@ -277,13 +289,13 @@ 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); -@@ -619,6 +642,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); @@ -292,11 +304,11 @@ After applying this patch, run these commands for a successful build: + } + if ((recv_ok && (!delay_updates || !partialptr)) || inplace) { - if (partialptr == fname || *partial_dir == '/') - partialptr = NULL; + char *temp_copy_name; + if (partialptr == fname) --- old/rsync.h +++ new/rsync.h -@@ -103,6 +103,7 @@ +@@ -104,6 +104,7 @@ #define IOERR_DEL_LIMIT (1<<2) #define MAX_ARGS 1000 @@ -306,7 +318,7 @@ After applying this patch, run these commands for a successful build: --- old/rsync.yo +++ new/rsync.yo -@@ -355,6 +355,7 @@ to the detailed description below for a +@@ -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 @@ -314,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 -@@ -391,6 +392,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 @@ -323,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 -@@ -1610,6 +1613,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. @@ -359,16 +371,16 @@ 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 -@@ -41,6 +41,7 @@ extern int write_batch; +@@ -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]; @@ -394,7 +406,7 @@ After applying this patch, run these commands for a successful build: 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; } @@ -402,7 +414,7 @@ After applying this patch, run these commands for a successful build: 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; } @@ -420,7 +432,7 @@ After applying this patch, run these commands for a successful build: + 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", @@ -436,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); -@@ -363,6 +412,8 @@ void send_files(struct file_list *flist, +@@ -366,6 +415,8 @@ void send_files(struct file_list *flist, } } close(fd);