+}
--- old/receiver.c
+++ new/receiver.c
-@@ -49,6 +49,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;
-@@ -350,6 +351,8 @@ int recv_files(int f_in, char *local_nam
+ 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;
if (verbose > 2)
rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->count);
-@@ -359,6 +362,23 @@ int recv_files(int f_in, char *local_nam
+@@ -358,6 +361,23 @@ int recv_files(int f_in, char *local_nam
updating_basis = inplace;
while (1) {
cleanup_disable();
-@@ -619,6 +639,9 @@ int recv_files(int f_in, char *local_nam
+@@ -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);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, F_LENGTH(file));
-@@ -633,6 +656,16 @@ int recv_files(int f_in, char *local_nam
+@@ -634,6 +657,16 @@ int recv_files(int f_in, char *local_nam
exit_cleanup(RERR_FILEIO);
}
--protocol=NUM force an older protocol version to be used
--checksum-seed=NUM set block/file checksum seed (advanced)
-4, --ipv4 prefer IPv4
-@@ -1774,6 +1777,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.
version of rsync. For instance, if rsync 2.6.4 is being used with the
--- old/sender.c
+++ new/sender.c
-@@ -44,6 +44,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 char *source_filter;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist;
-+extern char *source_filter;
- extern char *stdout_format;
- /**
-@@ -176,6 +177,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;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
-@@ -266,6 +287,7 @@ void send_files(int f_in, int f_out)
+@@ -265,6 +286,7 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
fd = do_open(fname, O_RDONLY, 0);
if (fd == -1) {
if (errno == ENOENT) {
-@@ -296,6 +318,33 @@ void send_files(int f_in, int f_out)
+@@ -295,6 +317,33 @@ void send_files(int f_in, int f_out)
exit_cleanup(RERR_PROTOCOL);
}
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);
-@@ -337,6 +386,8 @@ void send_files(int f_in, int f_out)
+@@ -336,6 +385,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);