X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/e2e42a01ba5a2258edf1510280bb83864a0c8748..6ac9ce9a46c911cbaa7f3d1c33f49f595373622d:/source-filter_dest-filter.diff

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index de0410b..f8fcff2 100644
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -133,7 +133,7 @@ diff --git a/options.c b/options.c
  	if (files_from) {
  		char *h, *p;
  		int q;
-@@ -1959,6 +1978,25 @@ void server_options(char **args, int *argc_p)
+@@ -1967,6 +1986,25 @@ void server_options(char **args, int *argc_p)
  		}
  	}
  
@@ -342,7 +342,7 @@ diff --git a/rsync.yo b/rsync.yo
       --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)
-@@ -2039,6 +2042,33 @@ file previously generated by bf(--write-batch).
+@@ -2051,6 +2054,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.
  
@@ -387,7 +387,7 @@ diff --git a/sender.c b/sender.c
  extern struct stats stats;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  
-@@ -181,6 +182,26 @@ void send_files(int f_in, int f_out)
+@@ -175,6 +176,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 ndx, j;
@@ -414,7 +414,7 @@ diff --git a/sender.c b/sender.c
  
  	if (verbose > 2)
  		rprintf(FINFO, "send_files starting\n");
-@@ -285,6 +306,7 @@ void send_files(int f_in, int f_out)
+@@ -279,6 +300,7 @@ void send_files(int f_in, int f_out)
  			exit_cleanup(RERR_PROTOCOL);
  		}
  
@@ -422,7 +422,7 @@ diff --git a/sender.c b/sender.c
  		fd = do_open(fname, O_RDONLY, 0);
  		if (fd == -1) {
  			if (errno == ENOENT) {
-@@ -306,6 +328,33 @@ void send_files(int f_in, int f_out)
+@@ -300,6 +322,33 @@ void send_files(int f_in, int f_out)
  			continue;
  		}
  
@@ -456,7 +456,7 @@ diff --git a/sender.c b/sender.c
  		/* map the local file */
  		if (do_fstat(fd, &st) != 0) {
  			io_error |= IOERR_GENERAL;
-@@ -356,6 +405,8 @@ void send_files(int f_in, int f_out)
+@@ -350,6 +399,8 @@ void send_files(int f_in, int f_out)
  			}
  		}
  		close(fd);