X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/85096e5eda83525eadddc9c6b1bc8135ac22e54a..fc5573623194fab2a331d1ffc8d284c9e25e06e7:/source-filter_dest-filter.diff

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index f6035bb..62a19aa 100644
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -31,9 +31,10 @@ To use this patch, run these commands for a successful build:
     make
 
 diff --git a/generator.c b/generator.c
+index 12007a1..88bd5e7 100644
 --- 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;
-@@ -676,7 +677,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -524,7 +525,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)
  {
@@ -51,9 +52,10 @@ diff --git a/generator.c b/generator.c
  
  	/* 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
-@@ -139,7 +139,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
+@@ -140,7 +140,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
  }
  
  /* Wait for a process to exit, calling io_flush while waiting. */
@@ -63,17 +65,18 @@ diff --git a/main.c b/main.c
  	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 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 +85,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");
+@@ -739,6 +742,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)
+@@ -778,6 +782,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 +102,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[] = {
+@@ -887,6 +893,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 +110,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[] = {
+@@ -1007,6 +1014,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)
+@@ -2149,6 +2158,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
  		}
  	}
  
@@ -133,9 +136,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)
- 		}
- 	}
+@@ -2493,6 +2512,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";
@@ -160,9 +163,10 @@ diff --git a/options.c b/options.c
  		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
-@@ -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 +175,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 +219,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();
@@ -241,6 +245,7 @@ diff --git a/pipe.c b/pipe.c
 +	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;
@@ -249,18 +254,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];
+@@ -441,6 +442,8 @@ int recv_files(int f_in, 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)
+@@ -448,6 +451,23 @@ int recv_files(int f_in, char *local_name)
  	if (delay_updates)
  		delayed_bits = bitbag_create(cur_flist->used + 1);
  
@@ -284,8 +289,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)
+@@ -742,6 +762,9 @@ int recv_files(int f_in, 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 +299,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)
+@@ -756,6 +779,16 @@ int recv_files(int f_in, char *local_name)
  			exit_cleanup(RERR_FILEIO);
  		}
  
@@ -312,9 +317,10 @@ diff --git a/receiver.c b/receiver.c
  			if (partialptr == fname)
  				partialptr = NULL;
 diff --git a/rsync.h b/rsync.h
+index be7cf8a..8d78818 100644
 --- a/rsync.h
 +++ b/rsync.h
-@@ -133,6 +133,7 @@
+@@ -138,6 +138,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000
@@ -323,9 +329,10 @@ diff --git a/rsync.h b/rsync.h
  #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
-@@ -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 +340,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 +349,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)
-@@ -2023,6 +2026,33 @@ file previously generated by bf(--write-batch).
+@@ -2256,6 +2259,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.
  
@@ -377,9 +384,10 @@ diff --git a/rsync.yo b/rsync.yo
  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
-@@ -43,6 +43,7 @@ extern int do_progress;
+@@ -42,6 +42,7 @@ extern int make_backups;
  extern int inplace;
  extern int batch_fd;
  extern int write_batch;
@@ -387,7 +395,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)
+@@ -174,6 +175,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;
@@ -412,9 +420,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)
+@@ -299,6 +320,7 @@ void send_files(int f_in, int f_out)
  			exit_cleanup(RERR_PROTOCOL);
  		}
  
@@ -422,7 +430,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)
+@@ -320,6 +342,33 @@ void send_files(int f_in, int f_out)
  			continue;
  		}
  
@@ -456,7 +464,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)
+@@ -370,6 +419,8 @@ void send_files(int f_in, int f_out)
  			}
  		}
  		close(fd);