The patches for 3.3.0.

[rsync-patches.git] / downdate.diff

diff --git a/downdate.diff b/downdate.diff
index fb019795d5ff1b58d99bc155a1ed4cf9d5e642aa..7cdc377b580dffad65a7b6dae78867db83fc24d0 100644 (file)
--- a/downdate.diff
+++ b/downdate.diff
@@ -1,4 +1,4 @@
-A patch from Stefan Müller to add the --downdate option, which works
+A patch from Stefan Müller to add the --downdate option, which works
 in the opposite manner as --update.
 
 To use this patch, run these commands for a successful build:
@@ -7,32 +7,32 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
+based-on: 6c8ca91c731b7bf2b081694bda85b7dadc2b7aff
 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;
 +extern int downdate_only;
+ extern int human_readable;
  extern int ignore_existing;
  extern int ignore_non_existing;
- extern int inplace;
-@@ -1722,6 +1723,13 @@ 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;
        }
  
-+      if (downdate_only && statret == 0
-+          && cmp_time(sx.st.st_mtime, file->modtime) < 0) {
-+              if (verbose > 1)
++      if (downdate_only > 0 && statret == 0 && file->modtime - sx.st.st_mtime >= modify_window) {
++              if (INFO_GTE(SKIP, 1))
 +                      rprintf(FINFO, "%s is older\n", fname);
 +              return;
 +      }
 +
-       fnamecmp = fname;
        fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -2088,6 +2096,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;
-@@ -2113,6 +2122,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,27 +51,30 @@ diff --git a/generator.c b/generator.c
 diff --git a/options.c b/options.c
 --- a/options.c
 +++ b/options.c
-@@ -60,6 +60,7 @@ int preserve_uid = 0;
- int preserve_gid = 0;
- int preserve_times = 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;
  int dry_run = 0;
- int do_xfers = 1;
-@@ -326,6 +327,7 @@ void usage(enum logcode F)
-   rprintf(F,"     --backup-dir=DIR        make backups into hierarchy based in DIR\n");
-   rprintf(F,"     --suffix=SUFFIX         set backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
-   rprintf(F," -u, --update                skip files that are newer on the receiver\n");
-+  rprintf(F," -w, --downdate              skip files that are older on the receiver\n");
-   rprintf(F,"     --inplace               update destination files in-place (SEE MAN PAGE)\n");
-   rprintf(F,"     --append                append data onto shorter files\n");
-   rprintf(F,"     --append-verify         like --append, but with old data in file checksum\n");
-@@ -534,6 +536,7 @@ static struct poptOption long_options[] = {
-   {"no-one-file-system",'x',POPT_ARG_VAL,   &one_file_system, 0, 0, 0 },
-   {"no-x",            'x', POPT_ARG_VAL,    &one_file_system, 0, 0, 0 },
+@@ -693,6 +694,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 },
 +  {"downdate",        'w', POPT_ARG_NONE,   &downdate_only, 0, 0, 0 },
    {"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 },
+diff --git a/rsync.1.md b/rsync.1.md
+--- a/rsync.1.md
++++ b/rsync.1.md
+@@ -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
++--downdate, -w           skip files that are older on the receiver
+ --inplace                update destination files in-place
+ --append                 append data onto shorter files
+ --append-verify          --append w/old data in file checksum