* pass --drop-cache on to the remote server
* make test works now
---- old/checksum.c
-+++ new/checksum.c
+diff --git a/checksum.c b/checksum.c
+--- a/checksum.c
++++ b/checksum.c
@@ -26,6 +26,10 @@ extern int protocol_version;
int csum_length = SHORT_SUM_LENGTH; /* initial value */
/*
a simple 32 bit checksum that can be upadted from either end
(inspired by Mark Adler's Adler-32 checksum)
---- old/cleanup.c
-+++ new/cleanup.c
+diff --git a/cleanup.c b/cleanup.c
+--- a/cleanup.c
++++ b/cleanup.c
@@ -46,7 +46,13 @@ void close_all(void)
int fd;
int ret;
max_fd = sysconf(_SC_OPEN_MAX) - 1;
for (fd = max_fd; fd >= 0; fd--) {
if ((ret = do_fstat(fd, &st)) == 0) {
---- old/configure.in
-+++ new/configure.in
-@@ -547,7 +547,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+diff --git a/configure.in b/configure.in
+--- a/configure.in
++++ b/configure.in
+@@ -552,7 +552,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
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 getxattr \
AC_CHECK_FUNCS(getpgrp tcgetpgrp)
if test $ac_cv_func_getpgrp = yes; then
---- old/fileio.c
-+++ new/fileio.c
+diff --git a/fileio.c b/fileio.c
+--- a/fileio.c
++++ b/fileio.c
@@ -30,6 +30,12 @@ extern int sparse_files;
static char last_byte;
static size_t sparse_seek = 0;
int sparse_end(int f)
{
int ret;
---- old/generator.c
-+++ new/generator.c
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
@@ -112,6 +112,10 @@ static int need_retouch_dir_times;
static int need_retouch_dir_perms;
static const char *solo_file = NULL;
/* For calling delete_item() and delete_dir_contents(). */
#define DEL_RECURSE (1<<1) /* recurse */
#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
---- old/options.c
-+++ new/options.c
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
@@ -58,6 +58,7 @@ int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
-@@ -319,6 +320,9 @@ void usage(enum logcode F)
+@@ -320,6 +321,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");
-@@ -522,6 +526,9 @@ static struct poptOption long_options[]
+@@ -524,6 +528,9 @@ static struct poptOption long_options[] = {
{"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 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 },
-@@ -1659,6 +1666,11 @@ void server_options(char **args, int *ar
+@@ -1662,6 +1669,11 @@ void server_options(char **args, int *argc_p)
if (!am_sender)
args[ac++] = "--sender";
x = 1;
argstr[0] = '-';
---- old/receiver.c
-+++ new/receiver.c
+diff --git a/receiver.c b/receiver.c
+--- a/receiver.c
++++ b/receiver.c
@@ -62,6 +62,10 @@ static int phase = 0, redoing = 0;
/* We're either updating the basis file or an identical copy: */
static int updating_basis_or_equiv;
/*
* get_tmpname() - create a tmp filename for a given filename
*
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -352,6 +352,7 @@ to the detailed description below for a
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -352,6 +352,7 @@ to the detailed description below for a complete description. verb(
--super receiver attempts super-user activities
--fake-super store/recover privileged attrs using xattrs
-S, --sparse handle sparse files efficiently
-n, --dry-run perform a trial run with no changes made
-W, --whole-file copy files whole (without rsync algorithm)
-x, --one-file-system don't cross filesystem boundaries
-@@ -1022,6 +1023,10 @@ NOTE: Don't use this option when the des
+@@ -1023,6 +1024,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.
dit(bf(-n, --dry-run)) This makes rsync perform a trial run that doesn't
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
---- old/sender.c
-+++ new/sender.c
+diff --git a/sender.c b/sender.c
+--- a/sender.c
++++ b/sender.c
@@ -46,6 +46,10 @@ extern int write_batch;
extern struct stats stats;
extern struct file_list *cur_flist, *first_flist, *dir_flist;
/**
* @file
*
---- old/t_unsafe.c
-+++ new/t_unsafe.c
+diff --git a/t_unsafe.c b/t_unsafe.c
+--- a/t_unsafe.c
++++ b/t_unsafe.c
@@ -28,6 +28,7 @@ int am_root = 0;
int read_only = 0;
int list_only = 0;
int preserve_perms = 0;
int
---- old/util.c
-+++ new/util.c
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
@@ -26,6 +26,7 @@
extern int verbose;
extern int dry_run;
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff