X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/drop-cache.diff

diff --git a/drop-cache.diff b/drop-cache.diff
index be0f9eb..e4639e2 100644
--- a/drop-cache.diff
+++ b/drop-cache.diff
@@ -69,8 +69,8 @@ To use this patch, run these commands for a successful build:
     ./configure                         (optional if already run)
     make
 
+based-on: 181c9faf928faad08ef095f4667afe460ec3bef6
 diff --git a/checksum.c b/checksum.c
-index 811b5b6..f1f51cb 100644
 --- a/checksum.c
 +++ b/checksum.c
 @@ -24,6 +24,10 @@
@@ -85,7 +85,6 @@ index 811b5b6..f1f51cb 100644
    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)
@@ -103,7 +102,6 @@ index 19ef072..84a6cf3 100644
  	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 \
@@ -116,7 +114,6 @@ index bc7d4a7..e9ff45a 100644
  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;
@@ -133,7 +130,6 @@ index 0faa619..0326fe8 100644
  {
  	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;
@@ -148,7 +144,6 @@ index 12007a1..f0c7a91 100644
      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;
@@ -179,7 +174,7 @@ index e7c6c61..ce55d8e 100644
    {"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)
+@@ -2252,6 +2259,11 @@ void server_options(char **args, int *argc_p)
  	if (!am_sender)
  		args[ac++] = "--sender";
  
@@ -192,7 +187,6 @@ index e7c6c61..ce55d8e 100644
  	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;
@@ -207,7 +201,6 @@ index 4325e30..a3da64e 100644
   * get_tmpname() - create a tmp filename for a given filename
   *
 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(
@@ -218,7 +211,7 @@ index 941f7a5..512aa6b 100644
   -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"
+@@ -1127,6 +1128,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.
  
@@ -230,10 +223,9 @@ index 941f7a5..512aa6b 100644
  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;
+@@ -44,6 +44,10 @@ extern int write_batch;
  extern struct stats stats;
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
  
@@ -245,7 +237,6 @@ index bf8221d..9e23dbb 100644
   * @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;
@@ -257,7 +248,6 @@ index 9ba0aaa..3cb55e9 100644
  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 @@