--- 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;
extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -507,7 +508,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)
{
/* if always checksum is set then we use the checksum instead
--- old/main.c
+++ new/main.c
-@@ -122,7 +122,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. */
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;
{"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
}
}
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";
}
+}
--- old/receiver.c
+++ new/receiver.c
-@@ -48,6 +48,7 @@ extern int checksum_seed;
+@@ -49,6 +49,7 @@ extern int checksum_seed;
extern int inplace;
extern int delay_updates;
extern struct stats stats;
extern char *stdout_format;
extern char *tmpdir;
extern char *partial_dir;
-@@ -348,6 +349,8 @@ int recv_files(int f_in, struct file_lis
+@@ -350,6 +351,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 i, recv_ok;
+ int ndx, recv_ok;
+ pid_t pid = 0;
+ 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);
+@@ -359,6 +362,23 @@ int recv_files(int f_in, char *local_nam
updating_basis = inplace;
while (1) {
cleanup_disable();
-@@ -607,6 +627,9 @@ int recv_files(int f_in, struct file_lis
+@@ -619,6 +639,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));
-@@ -621,6 +644,16 @@ int recv_files(int f_in, struct file_lis
+@@ -633,6 +656,16 @@ int recv_files(int f_in, char *local_nam
exit_cleanup(RERR_FILEIO);
}
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
--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-
+@@ -1774,6 +1777,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
-@@ -43,6 +43,7 @@ extern int batch_fd;
+@@ -44,6 +44,7 @@ extern int batch_fd;
extern int write_batch;
extern struct stats stats;
- extern struct file_list *the_file_list;
+ extern struct file_list *cur_flist, *first_flist;
+extern char *source_filter;
extern char *stdout_format;
-
-@@ -174,6 +175,26 @@ void send_files(struct file_list *flist,
+ /**
+@@ -176,6 +177,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;
if (verbose > 2)
rprintf(FINFO, "send_files starting\n");
-@@ -247,6 +268,7 @@ void send_files(struct file_list *flist,
- return;
+@@ -266,6 +287,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;
+@@ -296,6 +318,33 @@ void send_files(int f_in, int f_out)
+ exit_cleanup(RERR_PROTOCOL);
}
+ if (source_filter) {
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,
+@@ -337,6 +386,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff