X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/c8a8b4a7fd58ee1ee8b055a1559c71c9921d8753..e9d4ab8849c465e766a494765b29e26564f284d0:/drop-cache.diff

diff --git a/drop-cache.diff b/drop-cache.diff
index 52d14d7..e0a3558 100644
--- a/drop-cache.diff
+++ b/drop-cache.diff
@@ -94,12 +94,12 @@ Changes:
  		if ((ret = do_fstat(fd, &st)) == 0) {
 --- old/configure.in
 +++ new/configure.in
-@@ -561,7 +561,7 @@ AC_CHECK_FUNCS(waitpid wait4 getcwd strd
+@@ -547,7 +547,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 getxattr \
--    extattr_get_link sigaction sigprocmask)
-+    extattr_get_link sigaction sigprocmask posix_fadvise64)
+-    extattr_get_link sigaction sigprocmask setattrlist)
++    extattr_get_link sigaction sigprocmask setattrlist posix_fadvise64)
  
  AC_CHECK_FUNCS(getpgrp tcgetpgrp)
  if test $ac_cv_func_getpgrp = yes; then
@@ -120,7 +120,7 @@ Changes:
  	int ret;
 --- old/generator.c
 +++ new/generator.c
-@@ -114,6 +114,10 @@ static int need_retouch_dir_times;
+@@ -112,6 +112,10 @@ static int need_retouch_dir_times;
  static int need_retouch_dir_perms;
  static const char *solo_file = NULL;
  
@@ -161,7 +161,7 @@ Changes:
    {"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 },
-@@ -1664,6 +1671,11 @@ void server_options(char **args, int *ar
+@@ -1659,6 +1666,11 @@ void server_options(char **args, int *ar
  	if (!am_sender)
  		args[ac++] = "--sender";
  
@@ -177,7 +177,7 @@ Changes:
 +++ new/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;
+ static int updating_basis_or_equiv;
  
 +#ifdef HAVE_POSIX_FADVISE64
 +#define close(fd) fadv_close(fd)
@@ -188,15 +188,15 @@ Changes:
   *
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -353,6 +353,7 @@ to the detailed description below for a 
+@@ -352,6 +352,7 @@ to the detailed description below for a 
       --super                 receiver attempts super-user activities
       --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
 +     --drop-cache            tell OS to drop caching of file data
-  -n, --dry-run               show what would have been transferred
+  -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
-@@ -1009,6 +1010,10 @@ NOTE: Don't use this option when the des
+@@ -1022,6 +1023,10 @@ 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.
  
@@ -204,9 +204,9 @@ Changes:
 +prevents rsync from filling up the filesystem cache.  This can sometimes help
 +to make a system perform better by keeping non-rsync files in the disk cache.
 +
- dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
- instead it will just report the actions it would have taken.
- 
+ 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
 @@ -46,6 +46,10 @@ extern int write_batch;