X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..refs/heads/master:/source-filter_dest-filter.diff

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 62a19aa..d0d67bf 100644
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -30,8 +30,8 @@ To use this patch, run these commands for a successful build:
     ./configure                                (optional if already run)
     make
 
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
 diff --git a/generator.c b/generator.c
-index 12007a1..88bd5e7 100644
 --- a/generator.c
 +++ b/generator.c
 @@ -64,6 +64,7 @@ extern int append_mode;
@@ -42,7 +42,7 @@ index 12007a1..88bd5e7 100644
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -524,7 +525,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -523,7 +524,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)
  {
@@ -52,10 +52,9 @@ index 12007a1..88bd5e7 100644
  
  	/* if always checksum is set then we use the checksum instead
 diff --git a/main.c b/main.c
-index 2ef2f47..e7b4a05 100644
 --- a/main.c
 +++ b/main.c
-@@ -140,7 +140,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
+@@ -153,7 +153,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
  }
  
  /* Wait for a process to exit, calling io_flush while waiting. */
@@ -65,7 +64,6 @@ index 2ef2f47..e7b4a05 100644
  	pid_t waited_pid;
  	int status;
 diff --git a/options.c b/options.c
-index e7c6c61..059bcbf 100644
 --- a/options.c
 +++ b/options.c
 @@ -105,6 +105,7 @@ int safe_symlinks = 0;
@@ -85,7 +83,7 @@ index e7c6c61..059bcbf 100644
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
-@@ -739,6 +742,7 @@ void usage(enum logcode F)
+@@ -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");
@@ -93,7 +91,7 @@ index e7c6c61..059bcbf 100644
    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");
-@@ -778,6 +782,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");
@@ -102,7 +100,7 @@ index e7c6c61..059bcbf 100644
    rprintf(F,"     --protocol=NUM          force an older protocol version to be used\n");
  #ifdef ICONV_OPTION
    rprintf(F,"     --iconv=CONVERT_SPEC    request charset conversion of filenames\n");
-@@ -887,6 +893,7 @@ static struct poptOption long_options[] = {
+@@ -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 },
@@ -110,7 +108,7 @@ index e7c6c61..059bcbf 100644
    {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
    {"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 },
-@@ -1007,6 +1014,8 @@ static struct poptOption long_options[] = {
+@@ -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 },
@@ -119,7 +117,7 @@ index e7c6c61..059bcbf 100644
    {"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 },
-@@ -2149,6 +2158,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2201,6 +2210,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		}
  	}
  
@@ -136,7 +134,7 @@ index e7c6c61..059bcbf 100644
  	if (files_from) {
  		char *h, *p;
  		int q;
-@@ -2493,6 +2512,25 @@ void server_options(char **args, int *argc_p)
+@@ -2545,6 +2564,25 @@ void server_options(char **args, int *argc_p)
  	else if (missing_args == 1 && !am_sender)
  		args[ac++] = "--ignore-missing-args";
  
@@ -163,7 +161,6 @@ index e7c6c61..059bcbf 100644
  		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
  			goto oom;
 diff --git a/pipe.c b/pipe.c
-index a33117c..43eea31 100644
 --- a/pipe.c
 +++ b/pipe.c
 @@ -180,3 +180,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
@@ -245,7 +242,6 @@ index a33117c..43eea31 100644
 +	return pid;
 +}
 diff --git a/receiver.c b/receiver.c
-index 4325e30..e5ede73 100644
 --- a/receiver.c
 +++ b/receiver.c
 @@ -52,6 +52,7 @@ extern int delay_updates;
@@ -256,7 +252,7 @@ index 4325e30..e5ede73 100644
  extern char *partial_dir;
  extern char *basis_dir[MAX_BASIS_DIRS+1];
  extern char sender_file_sum[MAX_DIGEST_LEN];
-@@ -441,6 +442,8 @@ int recv_files(int f_in, char *local_name)
+@@ -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;
@@ -265,7 +261,7 @@ index 4325e30..e5ede73 100644
  
  	if (DEBUG_GTE(RECV, 1))
  		rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -448,6 +451,23 @@ int recv_files(int f_in, char *local_name)
+@@ -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);
  
@@ -289,7 +285,7 @@ index 4325e30..e5ede73 100644
  	while (1) {
  		cleanup_disable();
  
-@@ -742,6 +762,9 @@ int recv_files(int f_in, char *local_name)
+@@ -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);
  
@@ -299,7 +295,7 @@ index 4325e30..e5ede73 100644
  		/* recv file data */
  		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
  				       fname, fd2, F_LENGTH(file));
-@@ -756,6 +779,16 @@ int recv_files(int f_in, char *local_name)
+@@ -791,6 +814,16 @@ int recv_files(int f_in, int f_out, char *local_name)
  			exit_cleanup(RERR_FILEIO);
  		}
  
@@ -317,10 +313,9 @@ index 4325e30..e5ede73 100644
  			if (partialptr == fname)
  				partialptr = NULL;
 diff --git a/rsync.h b/rsync.h
-index be7cf8a..8d78818 100644
 --- a/rsync.h
 +++ b/rsync.h
-@@ -138,6 +138,7 @@
+@@ -143,6 +143,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000
@@ -329,7 +324,6 @@ index be7cf8a..8d78818 100644
  #define MAX_SERVER_ARGS (MAX_BASIS_DIRS*2 + 100)
  
 diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..edfad5e 100644
 --- a/rsync.yo
 +++ b/rsync.yo
 @@ -394,6 +394,7 @@ to the detailed description below for a complete description.  verb(
@@ -349,7 +343,7 @@ index 941f7a5..edfad5e 100644
       --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)
-@@ -2256,6 +2259,33 @@ file previously generated by bf(--write-batch).
+@@ -2335,6 +2338,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.
  
@@ -384,20 +378,19 @@ index 941f7a5..edfad5e 100644
  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
 diff --git a/sender.c b/sender.c
-index bf8221d..f315f80 100644
 --- a/sender.c
 +++ b/sender.c
-@@ -42,6 +42,7 @@ extern int make_backups;
- extern int inplace;
+@@ -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 BOOL we_send_keepalive_messages;
  extern struct stats stats;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
- 
-@@ -174,6 +175,26 @@ void send_files(int f_in, int f_out)
- 	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
+@@ -178,6 +179,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;
@@ -422,7 +415,7 @@ index bf8221d..f315f80 100644
  
  	if (DEBUG_GTE(SEND, 1))
  		rprintf(FINFO, "send_files starting\n");
-@@ -299,6 +320,7 @@ void send_files(int f_in, int f_out)
+@@ -311,6 +332,7 @@ void send_files(int f_in, int f_out)
  			exit_cleanup(RERR_PROTOCOL);
  		}
  
@@ -430,7 +423,7 @@ index bf8221d..f315f80 100644
  		fd = do_open(fname, O_RDONLY, 0);
  		if (fd == -1) {
  			if (errno == ENOENT) {
-@@ -320,6 +342,33 @@ void send_files(int f_in, int f_out)
+@@ -332,6 +354,33 @@ void send_files(int f_in, int f_out)
  			continue;
  		}
  
@@ -464,7 +457,7 @@ index bf8221d..f315f80 100644
  		/* map the local file */
  		if (do_fstat(fd, &st) != 0) {
  			io_error |= IOERR_GENERAL;
-@@ -370,6 +419,8 @@ void send_files(int f_in, int f_out)
+@@ -382,6 +431,8 @@ void send_files(int f_in, int f_out)
  			}
  		}
  		close(fd);