The patches for 3.0.8.

[rsync.git/patches.git] / drop-cache.diff

diff --git a/drop-cache.diff b/drop-cache.diff
index 6404c11a89b1931818afd284847db27f4f82b845..39faffc6bfbe1b03dcd8f73a408e7e6780d3fdb0 100644 (file)
--- a/drop-cache.diff
+++ b/drop-cache.diff
@@ -63,7 +63,7 @@ Changes:
 * pass --drop-cache on to the remote server
 * make test works now
 
-based-on: 8750f64ec7893c263b51e538895af3092bce9f4c
+based-on: 1ddcdaf3f6808ba53aef9e19f630a18808de22ac
 diff --git a/checksum.c b/checksum.c
 --- a/checksum.c
 +++ b/checksum.c
@@ -98,7 +98,7 @@ diff --git a/cleanup.c b/cleanup.c
 diff --git a/configure.ac b/configure.ac
 --- a/configure.ac
 +++ b/configure.ac
-@@ -568,6 +568,7 @@ AC_FUNC_ALLOCA
+@@ -570,6 +570,7 @@ AC_FUNC_ALLOCA
  AC_CHECK_FUNCS(waitpid wait4 getcwd strdup chown chmod lchmod mknod mkfifo \
      fchmod fstat ftruncate strchr readlink link utime utimes lutimes strftime \
      memmove lchown vsnprintf snprintf vasprintf asprintf setsid strpbrk \
@@ -204,9 +204,9 @@ diff --git a/rsync.yo b/rsync.yo
   -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
-@@ -1106,6 +1107,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.
+@@ -1103,6 +1104,10 @@ dit(bf(-S, --sparse)) Try to handle sparse files efficiently so they take
+ up less space on the destination.  Conflicts with bf(--inplace) because it's
+ not possible to overwrite data in a sparse fashion.
  
 +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
@@ -243,15 +243,15 @@ diff --git a/t_unsafe.c b/t_unsafe.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
-@@ -26,6 +26,7 @@
+@@ -25,6 +25,7 @@
+ 
  extern int verbose;
- extern int dry_run;
  extern int module_id;
 +extern int drop_cache;
  extern int modify_window;
  extern int relative_paths;
  extern int preserve_times;
-@@ -43,6 +44,131 @@ char curr_dir[MAXPATHLEN];
+@@ -42,6 +43,131 @@ char curr_dir[MAXPATHLEN];
  unsigned int curr_dir_len;
  int curr_dir_depth; /* This is only set for a sanitizing daemon. */