The patches for 3.0.0pre9.

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

diff --git a/drop-cache.diff b/drop-cache.diff
index 8c282e0..6803125 100644 (file)
--- a/drop-cache.diff
+++ b/drop-cache.diff
@@ -125,7 +125,7 @@ diff --git a/fileio.c b/fileio.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;
+@@ -113,6 +113,10 @@ static int need_retouch_dir_times;
  static int need_retouch_dir_perms;
  static const char *solo_file = NULL;
  
@@ -134,8 +134,8 @@ diff --git a/generator.c b/generator.c
 +#endif
 +
  /* 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 */
+ #define DEL_OWNED_BY_US       (1<<0) /* file/dir has our uid */
+ #define DEL_RECURSE           (1<<1) /* if dir, delete all contents */
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
@@ -167,7 +167,7 @@ diff --git a/options.c b/options.c
    {"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 },
-@@ -1670,6 +1677,11 @@ void server_options(char **args, int *argc_p)
+@@ -1671,6 +1678,11 @@ void server_options(char **args, int *argc_p)
        if (!am_sender)
                args[ac++] = "--sender";
  
@@ -204,7 +204,7 @@ 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
-@@ -1023,6 +1024,10 @@ NOTE: Don't use this option when the destination is a Solaris "tmpfs"
+@@ -1036,6 +1037,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.
  
@@ -238,8 +238,8 @@ diff --git a/t_unsafe.c b/t_unsafe.c
  int verbose = 0;
 +int drop_cache = 0;
  int preserve_perms = 0;
+ int preserve_executability = 0;
  
- int
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c