--- old/configure.in
+++ new/configure.in
-@@ -555,7 +555,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -560,7 +560,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
strlcat strlcpy strtol mallinfo getgroups setgroups geteuid getegid \
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
strerror putenv iconv_open locale_charset nl_langinfo \
if test $ac_cv_func_getpgrp = yes; then
--- old/options.c
+++ new/options.c
-@@ -69,6 +69,7 @@ int remove_source_files = 0;
+@@ -70,6 +70,7 @@ int remove_source_files = 0;
int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
int sparse_files = 0;
int do_compression = 0;
int def_compress_level = Z_DEFAULT_COMPRESSION;
int am_root = 0;
-@@ -201,6 +202,7 @@ static void print_rsync_version(enum log
- char const *hardlinks = "no ";
+@@ -205,6 +206,7 @@ static void print_rsync_version(enum log
+ char const *xattrs = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
+ char const *preallocation = "no ";
STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
-@@ -223,6 +225,10 @@ static void print_rsync_version(enum log
+@@ -233,6 +235,10 @@ static void print_rsync_version(enum log
ipv6 = "";
#endif
+
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
- rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
-@@ -233,8 +239,8 @@ static void print_rsync_version(enum log
+ rprintf(f, "Copyright (C) 1996-2007 by Andrew Tridgell, Wayne Davison, and others.\n");
+@@ -243,8 +249,8 @@ static void print_rsync_version(enum log
(int)(sizeof (int64) * 8));
rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
got_socketpair, hardlinks, links, ipv6, have_inplace);
-- rprintf(f, " %sappend\n",
-- have_inplace);
-+ rprintf(f, " %sappend, %spreallocation\n",
-+ have_inplace, preallocation);
+- rprintf(f, " %sappend, %sACLs, %sxattrs\n",
+- have_inplace, acls, xattrs);
++ rprintf(f, " %sappend, %sACLs, %sxattrs, %spreallocation\n",
++ have_inplace, acls, xattrs, preallocation);
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
-@@ -311,6 +317,9 @@ void usage(enum logcode F)
+@@ -327,6 +333,9 @@ void usage(enum logcode F)
rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
rprintf(F," --super receiver attempts super-user activities\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -W, --whole-file copy files whole (without rsync algorithm)\n");
rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n");
-@@ -468,6 +477,7 @@ static struct poptOption long_options[]
+@@ -494,6 +503,7 @@ static struct poptOption long_options[]
{"max-size", 0, POPT_ARG_STRING, &max_size_arg, OPT_MAX_SIZE, 0, 0 },
{"min-size", 0, POPT_ARG_STRING, &min_size_arg, OPT_MIN_SIZE, 0, 0 },
{"sparse", 'S', POPT_ARG_NONE, &sparse_files, 0, 0, 0 },
{"inplace", 0, POPT_ARG_NONE, &inplace, 0, 0, 0 },
{"append", 0, POPT_ARG_VAL, &append_mode, 1, 0, 0 },
{"del", 0, POPT_ARG_NONE, &delete_during, 0, 0, 0 },
-@@ -1132,6 +1142,15 @@ int parse_arguments(int *argc, const cha
+@@ -1187,6 +1197,15 @@ int parse_arguments(int *argc, const cha
}
#endif
if (write_batch && read_batch) {
snprintf(err_buf, sizeof err_buf,
"--write-batch and --read-batch can not be used together\n");
-@@ -1779,6 +1798,9 @@ void server_options(char **args,int *arg
+@@ -1838,6 +1857,9 @@ void server_options(char **args,int *arg
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
--- old/receiver.c
+++ new/receiver.c
-@@ -44,6 +44,7 @@ extern int cleanup_got_literal;
+@@ -45,6 +45,7 @@ extern int cleanup_got_literal;
extern int remove_source_files;
extern int append_mode;
extern int sparse_files;
extern int keep_partial;
extern int checksum_seed;
extern int inplace;
-@@ -137,6 +138,19 @@ static int receive_data(int f_in, char *
+@@ -138,6 +139,19 @@ static int receive_data(int f_in, char *
int32 i;
char *map = NULL;
read_sum_head(f_in, &sum);
if (fd_r >= 0 && size_r > 0) {
-@@ -244,8 +258,18 @@ static int receive_data(int f_in, char *
+@@ -245,8 +259,18 @@ static int receive_data(int f_in, char *
goto report_write_error;
#ifdef HAVE_FTRUNCATE
if (do_progress)
--- old/rsync.h
+++ new/rsync.h
-@@ -546,6 +546,10 @@ struct idev_node {
- #define IN_LOOPBACKNET 127
+@@ -549,6 +549,10 @@ struct idev_node {
+ #define ACLS_NEED_MASK 1
#endif
+#if defined HAVE_FTRUNCATE && defined HAVE_POSIX_FALLOCATE
union file_extras {
--- old/rsync.yo
+++ new/rsync.yo
-@@ -332,6 +332,7 @@ to the detailed description below for a
+@@ -334,6 +334,7 @@ to the detailed description below for a
-O, --omit-dir-times omit directories when preserving times
--super receiver attempts super-user activities
-S, --sparse handle sparse files efficiently
-n, --dry-run show what would have been transferred
-W, --whole-file copy files whole (without rsync algorithm)
-x, --one-file-system don't cross filesystem boundaries
-@@ -888,6 +889,19 @@ NOTE: Don't use this option when the des
+@@ -920,6 +921,19 @@ NOTE: Don't use this option when the des
filesystem. It doesn't seem to handle seeks over null regions
correctly and ends up corrupting the files.
--- old/t_stub.c
+++ new/t_stub.c
-@@ -23,6 +23,7 @@
+@@ -22,6 +22,7 @@
#include "rsync.h"
int modify_window = 0;
int human_readable = 0;
--- old/util.c
+++ new/util.c
-@@ -25,6 +25,7 @@
+@@ -24,6 +24,7 @@
extern int verbose;
extern int dry_run;
extern int module_id;
extern int modify_window;
extern int relative_paths;
-@@ -270,6 +271,10 @@ int copy_file(const char *source, const
+@@ -269,6 +270,10 @@ int copy_file(const char *source, const
int ofd;
char buf[1024 * 8];
int len; /* Number of bytes read into `buf'. */
ifd = do_open(source, O_RDONLY, 0);
if (ifd == -1) {
-@@ -289,7 +294,27 @@ int copy_file(const char *source, const
+@@ -288,7 +293,27 @@ int copy_file(const char *source, const
return -1;
}
if (full_write(ofd, buf, len) < 0) {
rsyserr(FERROR, errno, "write %s", full_fname(dest));
close(ifd);
-@@ -310,6 +335,16 @@ int copy_file(const char *source, const
+@@ -309,6 +334,16 @@ int copy_file(const char *source, const
full_fname(source));
}