./configure (optional if already run)
make
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
diff --git a/generator.c b/generator.c
-index 12007a1..88bd5e7 100644
--- a/generator.c
+++ b/generator.c
@@ -64,6 +64,7 @@ extern int append_mode;
/* 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
-@@ -140,7 +140,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
+@@ -142,7 +142,7 @@ pid_t wait_process(pid_t pid, int *status_ptr, int flags)
}
/* Wait for a process to exit, calling io_flush while waiting. */
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 safe_symlinks = 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 },
-@@ -2149,6 +2158,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2166,6 +2175,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -2493,6 +2512,25 @@ void server_options(char **args, int *argc_p)
+@@ -2510,6 +2529,25 @@ void server_options(char **args, int *argc_p)
else if (missing_args == 1 && !am_sender)
args[ac++] = "--ignore-missing-args";
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
@@ -180,3 +180,77 @@ pid_t local_child(int argc, char **argv, int *f_in, int *f_out,
+ 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;
if (partialptr == fname)
partialptr = NULL;
diff --git a/rsync.h b/rsync.h
-index be7cf8a..8d78818 100644
--- a/rsync.h
+++ b/rsync.h
@@ -138,6 +138,7 @@
#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
@@ -394,6 +394,7 @@ to the detailed description below for a complete description. verb(
--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)
-@@ -2256,6 +2259,33 @@ file previously generated by bf(--write-batch).
+@@ -2283,6 +2286,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.
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
-@@ -42,6 +42,7 @@ extern int make_backups;
+@@ -41,6 +41,7 @@ extern int make_backups;
extern int inplace;
extern int batch_fd;
extern int write_batch;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -174,6 +175,26 @@ void send_files(int f_in, int f_out)
+@@ -173,6 +174,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 (DEBUG_GTE(SEND, 1))
rprintf(FINFO, "send_files starting\n");
-@@ -299,6 +320,7 @@ void send_files(int f_in, int f_out)
+@@ -298,6 +319,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) {
-@@ -320,6 +342,33 @@ void send_files(int f_in, int f_out)
+@@ -319,6 +341,33 @@ void send_files(int f_in, int f_out)
continue;
}
/* map the local file */
if (do_fstat(fd, &st) != 0) {
io_error |= IOERR_GENERAL;
-@@ -370,6 +419,8 @@ void send_files(int f_in, int f_out)
+@@ -369,6 +418,8 @@ void send_files(int f_in, int f_out)
}
}
close(fd);