The patches for 3.2.7.

[rsync.git/patches.git] / downdate.diff

diff --git a/downdate.diff b/downdate.diff
index 39cc571d610231ff2ce80c75bae3d6cfb563087e..fcc3b044d7e1bbc75b34e30a8321d81f91585240 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,11 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
-based-on: fe2ef556d9ef11e5dd549e19a06a7a924f7ddfa1
+based-on: 6b5ae825db985e9d1c98576651b50c8e490ddb97
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -55,6 +55,7 @@ extern int ignore_errors;
+@@ -57,6 +57,7 @@ extern int ignore_errors;
  extern int remove_source_files;
  extern int delay_updates;
  extern int update_only;
@@ -19,7 +19,7 @@ diff --git a/generator.c b/generator.c
  extern int human_readable;
  extern int ignore_existing;
  extern int ignore_non_existing;
-@@ -1684,6 +1685,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1716,6 +1717,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                goto cleanup;
        }
  
@@ -31,8 +31,8 @@ diff --git a/generator.c b/generator.c
 +
        fnamecmp_type = FNAMECMP_FNAME;
  
-       if (statret == 0 && !(S_ISREG(sx.st.st_mode) || (write_devices && IS_DEVICE(sx.st.st_mode)))) {
-@@ -2128,6 +2135,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+       if (statret == 0 && !(stype == FT_REG || (write_devices && stype == FT_DEVICE))) {
+@@ -2162,6 +2169,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_existing = -ignore_existing;
                        ignore_non_existing = -ignore_non_existing;
                        update_only = -update_only;
@@ -40,7 +40,7 @@ diff --git a/generator.c b/generator.c
                        always_checksum = -always_checksum;
                        size_only = -size_only;
                        append_mode = -append_mode;
-@@ -2153,6 +2161,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -2187,6 +2195,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
                        ignore_existing = -ignore_existing;
                        ignore_non_existing = -ignore_non_existing;
                        update_only = -update_only;
@@ -51,15 +51,15 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -64,6 +64,7 @@ int preserve_uid = 0;
- int preserve_gid = 0;
- int preserve_times = 0;
- int preserve_atimes = 0;
-+int downdate_only = 0;
+@@ -68,6 +68,7 @@ int omit_dir_times = 0;
+ int omit_link_times = 0;
+ int trust_sender = 0;
  int update_only = 0;
++int downdate_only = 0;
  int open_noatime = 0;
  int cvs_exclude = 0;
-@@ -888,6 +889,7 @@ static struct poptOption long_options[] = {
+ int dry_run = 0;
+@@ -692,6 +693,7 @@ static struct poptOption long_options[] = {
    {"no-one-file-system",0, POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"no-x",             0,  POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
    {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
@@ -70,7 +70,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.1.md b/rsync.1.md
 --- a/rsync.1.md
 +++ b/rsync.1.md
-@@ -347,6 +347,7 @@ detailed description below for a complete description.
+@@ -431,6 +431,7 @@ has its own detailed description later in this manpage.
  --backup-dir=DIR         make backups into hierarchy based in DIR
  --suffix=SUFFIX          backup suffix (default ~ w/o --backup-dir)
  --update, -u             skip files that are newer on the receiver