X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/f9df736a3e22f15307f9e304eb9069b06e94208f..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/source-filter_dest-filter.diff

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index cd6d0c7..d0d67bf 100644
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -30,10 +30,11 @@ 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
 --- a/generator.c
 +++ b/generator.c
-@@ -63,6 +63,7 @@ extern int append_mode;
+@@ -64,6 +64,7 @@ extern int append_mode;
  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
@@ -41,7 +42,7 @@ diff --git a/generator.c b/generator.c
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -696,7 +697,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)
  {
@@ -53,7 +54,7 @@ diff --git a/generator.c b/generator.c
 diff --git a/main.c b/main.c
 --- a/main.c
 +++ b/main.c
-@@ -139,7 +139,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,15 +66,15 @@ diff --git a/main.c b/main.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -105,6 +105,7 @@ int keep_partial = 0;
- int safe_symlinks = 0;
+@@ -105,6 +105,7 @@ int safe_symlinks = 0;
  int copy_unsafe_links = 0;
+ int munge_symlinks = 0;
  int size_only = 0;
 +int times_only = 0;
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -162,6 +163,8 @@ char *logfile_name = NULL;
+@@ -164,6 +165,8 @@ char *logfile_name = NULL;
  char *logfile_format = NULL;
  char *stdout_format = NULL;
  char *password_file = NULL;
@@ -82,15 +83,15 @@ diff --git a/options.c b/options.c
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
-@@ -387,6 +390,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --contimeout=SECONDS    set daemon connection timeout in seconds\n");
+@@ -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");
 +  rprintf(F,"     --times-only            skip files that match in mod-time\n");
    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");
-@@ -426,6 +430,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");
@@ -99,7 +100,7 @@ diff --git a/options.c b/options.c
    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");
-@@ -527,6 +533,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 },
@@ -107,16 +108,16 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -630,6 +637,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 },
 +  {"source-filter",    0,  POPT_ARG_STRING, &source_filter, 0, 0, 0 },
 +  {"dest-filter",      0,  POPT_ARG_STRING, &dest_filter, 0, 0, 0 },
+   {"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 },
-   {"server",           0,  POPT_ARG_NONE,   0, OPT_SERVER, 0, 0 },
-@@ -1608,6 +1617,16 @@ int parse_arguments(int *argc_p, const char ***argv_p, int frommain)
+@@ -2201,6 +2210,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		}
  	}
  
@@ -133,9 +134,9 @@ diff --git a/options.c b/options.c
  	if (files_from) {
  		char *h, *p;
  		int q;
-@@ -1927,6 +1946,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";
  
 +	if (times_only && am_sender)
 +		args[ac++] = "--times-only";
@@ -162,7 +163,7 @@ diff --git a/options.c b/options.c
 diff --git a/pipe.c b/pipe.c
 --- a/pipe.c
 +++ b/pipe.c
-@@ -167,3 +167,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
+@@ -180,3 +180,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
  
  	return pid;
  }
@@ -171,8 +172,8 @@ diff --git a/pipe.c b/pipe.c
 +{
 +	pid_t pid;
 +	int pipefds[2];
-+	
-+	if (verbose >= 2)
++
++	if (DEBUG_GTE(CMD, 1))
 +		print_child_argv("opening connection using:", command);
 +
 +	if (pipe(pipefds) < 0) {
@@ -215,8 +216,8 @@ diff --git a/pipe.c b/pipe.c
 +pid_t run_filter_on_file(char *command[], int out, int in)
 +{
 +	pid_t pid;
-+	
-+	if (verbose >= 2)
++
++	if (DEBUG_GTE(CMD, 1))
 +		print_child_argv("opening connection using:", command);
 +
 +	pid = do_fork();
@@ -249,18 +250,18 @@ diff --git a/receiver.c b/receiver.c
  extern char *tmpdir;
 +extern char *dest_filter;
  extern char *partial_dir;
- extern char *basis_dir[];
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -395,6 +396,8 @@ int recv_files(int f_in, char *local_name)
+ extern char *basis_dir[MAX_BASIS_DIRS+1];
+ extern char sender_file_sum[MAX_DIGEST_LEN];
+@@ -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;
 +	pid_t pid = 0;
 +	char *filter_argv[MAX_FILTER_ARGS + 1];
  
- 	if (verbose > 2)
+ 	if (DEBUG_GTE(RECV, 1))
  		rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -402,6 +405,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);
  
@@ -284,8 +285,8 @@ diff --git a/receiver.c b/receiver.c
  	while (1) {
  		cleanup_disable();
  
-@@ -674,6 +694,9 @@ int recv_files(int f_in, char *local_name)
- 		else if (!am_server && verbose && do_progress)
+@@ -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);
  
 +		if (dest_filter)
@@ -294,7 +295,7 @@ diff --git a/receiver.c b/receiver.c
  		/* recv file data */
  		recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
  				       fname, fd2, F_LENGTH(file));
-@@ -688,6 +711,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);
  		}
  
@@ -314,7 +315,7 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -133,6 +133,7 @@
+@@ -143,6 +143,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000
@@ -325,7 +326,7 @@ diff --git a/rsync.h b/rsync.h
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
-@@ -382,6 +382,7 @@ to the detailed description below for a complete description.  verb(
+@@ -394,6 +394,7 @@ to the detailed description below for a complete description.  verb(
       --contimeout=SECONDS    set daemon connection timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
@@ -333,7 +334,7 @@ diff --git a/rsync.yo b/rsync.yo
       --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
-@@ -421,6 +422,8 @@ to the detailed description below for a complete description.  verb(
+@@ -434,6 +435,8 @@ to the detailed description below for a complete description.  verb(
       --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
@@ -342,7 +343,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)
-@@ -2021,6 +2024,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.
  
@@ -379,17 +380,17 @@ diff --git a/rsync.yo b/rsync.yo
 diff --git a/sender.c b/sender.c
 --- a/sender.c
 +++ b/sender.c
-@@ -43,6 +43,7 @@ extern int do_progress;
- 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;
- 
-@@ -181,6 +182,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;
@@ -412,9 +413,9 @@ diff --git a/sender.c b/sender.c
 +		}
 +	}
  
- 	if (verbose > 2)
+ 	if (DEBUG_GTE(SEND, 1))
  		rprintf(FINFO, "send_files starting\n");
-@@ -285,6 +306,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);
  		}
  
@@ -422,7 +423,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)
+@@ -332,6 +354,33 @@ void send_files(int f_in, int f_out)
  			continue;
  		}
  
@@ -456,7 +457,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)
+@@ -382,6 +431,8 @@ void send_files(int f_in, int f_out)
  			}
  		}
  		close(fd);