./configure (optional if already run)
make
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/checksum.c b/checksum.c
-index 811b5b6..f1f51cb 100644
--- a/checksum.c
+++ b/checksum.c
@@ -24,6 +24,10 @@
a simple 32 bit checksum that can be upadted from either end
(inspired by Mark Adler's Adler-32 checksum)
diff --git a/cleanup.c b/cleanup.c
-index 19ef072..84a6cf3 100644
--- a/cleanup.c
+++ b/cleanup.c
-@@ -47,7 +47,13 @@ void close_all(void)
+@@ -51,7 +51,13 @@ void close_all(void)
int fd;
int ret;
STRUCT_STAT st;
for (fd = max_fd; fd >= 0; fd--) {
if ((ret = do_fstat(fd, &st)) == 0) {
diff --git a/configure.in b/configure.in
-index bc7d4a7..e9ff45a 100644
--- a/configure.in
+++ b/configure.in
-@@ -553,7 +553,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
+@@ -589,7 +589,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
setlocale setmode open64 lseek64 mkstemp64 mtrace va_copy __va_copy \
- strerror putenv iconv_open locale_charset nl_langinfo getxattr \
+ seteuid strerror putenv iconv_open locale_charset nl_langinfo getxattr \
extattr_get_link sigaction sigprocmask setattrlist getgrouplist \
-- initgroups)
-+ initgroups posix_fadvise64)
+- initgroups utimensat)
++ initgroups utimensat posix_fadvise64)
dnl cygwin iconv.h defines iconv_open as libiconv_open
if test x"$ac_cv_func_iconv_open" != x"yes"; then
diff --git a/fileio.c b/fileio.c
-index 0faa619..0326fe8 100644
--- a/fileio.c
+++ b/fileio.c
@@ -31,6 +31,12 @@ extern int sparse_files;
{
int ret;
diff --git a/generator.c b/generator.c
-index 12007a1..f0c7a91 100644
--- a/generator.c
+++ b/generator.c
-@@ -112,6 +112,10 @@ static int need_retouch_dir_times;
+@@ -111,6 +111,10 @@ static int need_retouch_dir_times;
static int need_retouch_dir_perms;
static const char *solo_file = NULL;
TYPE_DIR, TYPE_SPECIAL, TYPE_DEVICE, TYPE_SYMLINK
};
diff --git a/options.c b/options.c
-index e7c6c61..ce55d8e 100644
--- a/options.c
+++ b/options.c
@@ -60,6 +60,7 @@ int preserve_uid = 0;
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
-@@ -670,6 +671,9 @@ void usage(enum logcode F)
+@@ -671,6 +672,9 @@ void usage(enum logcode F)
rprintf(F," --backup-dir=DIR make backups into hierarchy based in DIR\n");
rprintf(F," --suffix=SUFFIX set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update skip files that are newer on the receiver\n");
rprintf(F," --inplace update destination files in-place (SEE MAN PAGE)\n");
rprintf(F," --append append data onto shorter files\n");
rprintf(F," --append-verify like --append, but with old data in file checksum\n");
-@@ -891,6 +895,9 @@ static struct poptOption long_options[] = {
+@@ -892,6 +896,9 @@ static struct poptOption long_options[] = {
{"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
{"ignore-non-existing",0,POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
{"ignore-existing", 0, POPT_ARG_NONE, &ignore_existing, 0, 0, 0 },
-@@ -2235,6 +2242,11 @@ void server_options(char **args, int *argc_p)
+@@ -2287,6 +2294,11 @@ void server_options(char **args, int *argc_p)
if (!am_sender)
args[ac++] = "--sender";
argstr[0] = '-';
diff --git a/receiver.c b/receiver.c
-index 4325e30..a3da64e 100644
--- a/receiver.c
+++ b/receiver.c
@@ -64,6 +64,10 @@ static flist_ndx_list batch_redo_list;
+#define close(fd) fadv_close(fd)
+#endif
+
- /*
- * get_tmpname() - create a tmp filename for a given filename
- *
+ #define TMPNAME_SUFFIX ".XXXXXX"
+ #define TMPNAME_SUFFIX_LEN ((int)sizeof TMPNAME_SUFFIX - 1)
+ #define MAX_UNIQUE_NUMBER 999999
diff --git a/rsync.yo b/rsync.yo
-index 941f7a5..512aa6b 100644
--- a/rsync.yo
+++ b/rsync.yo
@@ -359,6 +359,7 @@ to the detailed description below for a complete description. verb(
-n, --dry-run perform a trial run with no changes made
-W, --whole-file copy files whole (w/o delta-xfer algorithm)
-x, --one-file-system don't cross filesystem boundaries
-@@ -1120,6 +1121,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
- filesystem. It doesn't seem to handle seeks over null regions
- correctly and ends up corrupting the files.
+@@ -1127,6 +1128,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
+ filesystem. It seems to have problems seeking over null regions,
+ and ends up corrupting the files.
+dit(bf(--drop-cache)) Tell the OS to drop the caching of the file data. This
+prevents rsync from filling up the filesystem cache. This can sometimes help
make any changes (and produces mostly the same output as a real run). It
is most commonly used in combination with the bf(-v, --verbose) and/or
diff --git a/sender.c b/sender.c
-index bf8221d..9e23dbb 100644
--- a/sender.c
+++ b/sender.c
-@@ -45,6 +45,10 @@ extern int write_batch;
- extern struct stats stats;
- extern struct file_list *cur_flist, *first_flist, *dir_flist;
+@@ -49,6 +49,10 @@ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+
+ BOOL extra_flist_sending_enabled;
+#ifdef HAVE_POSIX_FADVISE64
+#define close(fd) fadv_close(fd)
* @file
*
diff --git a/t_unsafe.c b/t_unsafe.c
-index 9ba0aaa..3cb55e9 100644
--- a/t_unsafe.c
+++ b/t_unsafe.c
-@@ -27,6 +27,7 @@ int dry_run = 0;
- int am_root = 0;
+@@ -28,6 +28,7 @@ int am_root = 0;
+ int am_sender = 1;
int read_only = 0;
int list_only = 0;
+int drop_cache = 0;
int preserve_perms = 0;
int preserve_executability = 0;
diff --git a/util.c b/util.c
-index 0cafed6..06d8770 100644
--- a/util.c
+++ b/util.c
@@ -27,6 +27,7 @@
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff