X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/81ecd8e0c3d10388565256dd822578c8bd5ccabb..acf4467ba2c7764f79d05a57712f3b06f517318c:/source-filter_dest-filter.diff

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 4495b6a..b89ebbb 100644
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -32,7 +32,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/generator.c
 +++ new/generator.c
-@@ -60,6 +60,7 @@ extern int append_mode;
+@@ -61,6 +61,7 @@ extern int append_mode;
  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
@@ -40,7 +40,7 @@ To use this patch, run these commands for a successful build:
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -508,7 +509,7 @@ void itemize(struct file_struct *file, i
+@@ -571,7 +572,7 @@ void itemize(struct file_struct *file, i
  /* 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,7 +51,7 @@ To use this patch, run these commands for a successful build:
  	/* if always checksum is set then we use the checksum instead
 --- old/main.c
 +++ new/main.c
-@@ -126,7 +126,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -128,7 +128,7 @@ pid_t wait_process(pid_t pid, int *statu
  }
  
  /* Wait for a process to exit, calling io_flush while waiting. */
@@ -70,7 +70,7 @@ To use this patch, run these commands for a successful build:
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -151,6 +152,8 @@ char *logfile_name = NULL;
+@@ -150,6 +151,8 @@ char *logfile_name = NULL;
  char *logfile_format = NULL;
  char *stdout_format = NULL;
  char *password_file = NULL;
@@ -113,7 +113,7 @@ To use this patch, run these commands for a successful build:
    {"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 },
-@@ -1409,6 +1418,16 @@ int parse_arguments(int *argc, const cha
+@@ -1416,6 +1425,16 @@ int parse_arguments(int *argc, const cha
  		}
  	}
  
@@ -130,7 +130,7 @@ To use this patch, run these commands for a successful build:
  	if (files_from) {
  		char *h, *p;
  		int q;
-@@ -1682,6 +1701,25 @@ void server_options(char **args,int *arg
+@@ -1692,6 +1711,25 @@ void server_options(char **args,int *arg
  			args[ac++] = "--size-only";
  	}
  
@@ -238,15 +238,15 @@ To use this patch, run these commands for a successful build:
 +}
 --- old/receiver.c
 +++ new/receiver.c
-@@ -48,6 +48,7 @@ extern int checksum_seed;
- extern int inplace;
- extern int delay_updates;
- extern struct stats stats;
-+extern char *dest_filter;
- extern char *stdout_format;
+@@ -52,6 +52,7 @@ extern struct stats stats;
  extern char *tmpdir;
  extern char *partial_dir;
-@@ -348,6 +349,8 @@ int recv_files(int f_in, struct file_lis
+ extern char *basis_dir[];
++extern char *dest_filter;
+ extern struct file_list *cur_flist, *first_flist;
+ extern struct filter_list_struct server_filter_list;
+ 
+@@ -349,6 +350,8 @@ int recv_files(int f_in, char *local_nam
  	enum logcode log_code = log_before_transfer ? FLOG : FINFO;
  	int max_phase = protocol_version >= 29 ? 2 : 1;
  	int ndx, recv_ok;
@@ -254,8 +254,8 @@ To use this patch, run these commands for a successful build:
 +	char *filter_argv[MAX_FILTER_ARGS + 1];
  
  	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
+ 		rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->count);
+@@ -358,6 +361,23 @@ int recv_files(int f_in, char *local_nam
  
  	updating_basis = inplace;
  
@@ -279,7 +279,7 @@ To use this patch, run these commands for a successful build:
  	while (1) {
  		cleanup_disable();
  
-@@ -607,6 +627,9 @@ int recv_files(int f_in, struct file_lis
+@@ -620,6 +640,9 @@ int recv_files(int f_in, char *local_nam
  		else if (!am_server && verbose && do_progress)
  			rprintf(FINFO, "%s\n", fname);
  
@@ -289,7 +289,7 @@ To use 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, F_LENGTH(file));
-@@ -621,6 +644,16 @@ int recv_files(int f_in, struct file_lis
+@@ -634,6 +657,16 @@ int recv_files(int f_in, char *local_nam
  			exit_cleanup(RERR_FILEIO);
  		}
  
@@ -308,7 +308,7 @@ To use this patch, run these commands for a successful build:
  			if (partialptr == fname)
 --- old/rsync.h
 +++ new/rsync.h
-@@ -105,6 +105,7 @@
+@@ -119,6 +119,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000
@@ -335,7 +335,7 @@ To use 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
-@@ -1772,6 +1775,33 @@ file previously generated by bf(--write-
+@@ -1804,6 +1807,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.
  
@@ -371,18 +371,18 @@ To use 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
-@@ -43,6 +43,7 @@ extern int batch_fd;
+@@ -42,6 +42,7 @@ extern int do_progress;
+ extern int inplace;
+ extern int batch_fd;
  extern int write_batch;
- extern struct stats stats;
- extern struct file_list *the_file_list;
 +extern char *source_filter;
- extern char *stdout_format;
- 
+ extern struct stats stats;
+ extern struct file_list *cur_flist, *first_flist;
  
-@@ -174,6 +175,26 @@ void send_files(struct file_list *flist,
+@@ -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 i, j;
+ 	int ndx, j;
 +	char *filter_argv[MAX_FILTER_ARGS + 1];
 +	char *tmp = 0;
 +	int unlink_tmp = 0;
@@ -406,16 +406,16 @@ To use this patch, run these commands for a successful build:
  
  	if (verbose > 2)
  		rprintf(FINFO, "send_files starting\n");
-@@ -247,6 +268,7 @@ void send_files(struct file_list *flist,
- 			return;
+@@ -265,6 +286,7 @@ void send_files(int f_in, int f_out)
+ 			exit_cleanup(RERR_PROTOCOL);
  		}
  
 +		unlink_tmp = 0;
  		fd = do_open(fname, O_RDONLY, 0);
  		if (fd == -1) {
  			if (errno == ENOENT) {
-@@ -275,6 +297,33 @@ void send_files(struct file_list *flist,
- 			return;
+@@ -295,6 +317,33 @@ void send_files(int f_in, int f_out)
+ 			exit_cleanup(RERR_PROTOCOL);
  		}
  
 +		if (source_filter) {
@@ -448,7 +448,7 @@ To use 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);
-@@ -316,6 +365,8 @@ void send_files(struct file_list *flist,
+@@ -336,6 +385,8 @@ void send_files(int f_in, int f_out)
  			}
  		}
  		close(fd);