X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc068916893d69f75d9eab25b5ebd46ed5341683..5214a41bbae94607b196b199b483710e1babf292:/downdate.diff

diff --git a/downdate.diff b/downdate.diff
index 29b5ec8..af9e881 100644
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,23 +7,25 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
---- old/generator.c
-+++ new/generator.c
-@@ -54,6 +54,7 @@ extern int ignore_errors;
+based-on: 24079e988fc31af4eba56cd2701fdc5a4154980d
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -56,6 +56,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;
-@@ -1437,6 +1438,13 @@ static void recv_generator(char *fname, 
- 		return;
+@@ -1530,6 +1531,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+ 		goto cleanup;
  	}
  
 +	if (downdate_only && statret == 0
-+	    && cmp_time(st.st_mtime, file->modtime) < 0) {
-+		if (verbose > 1)
++	    && cmp_time(sx.st.st_mtime, file->modtime) < 0) {
++		if (INFO_GTE(SKIP, 1))
 +			rprintf(FINFO, "%s is older\n", fname);
 +		return;
 +	}
@@ -31,43 +33,44 @@ To use this patch, run these commands for a successful build:
  	fnamecmp = fname;
  	fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -1780,6 +1788,7 @@ void generate_files(int f_out, char *loc
- 		ignore_existing = -ignore_existing;
- 		ignore_non_existing = -ignore_non_existing;
- 		update_only = -update_only;
-+		downdate_only = -downdate_only;
- 		always_checksum = -always_checksum;
- 		size_only = -size_only;
- 		append_mode = -append_mode;
-@@ -1819,6 +1828,7 @@ void generate_files(int f_out, char *loc
- 		ignore_existing = -ignore_existing;
- 		ignore_non_existing = -ignore_non_existing;
- 		update_only = -update_only;
-+		downdate_only = -downdate_only;
- 		always_checksum = -always_checksum;
- 		size_only = -size_only;
- 		append_mode = -append_mode;
---- old/options.c
-+++ new/options.c
-@@ -56,6 +56,7 @@ int preserve_gid = 0;
+@@ -1963,6 +1971,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;
++			downdate_only = -downdate_only;
+ 			always_checksum = -always_checksum;
+ 			size_only = -size_only;
+ 			append_mode = -append_mode;
+@@ -1988,6 +1997,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;
++			downdate_only = -downdate_only;
+ 			always_checksum = -always_checksum;
+ 			size_only = -size_only;
+ 			append_mode = -append_mode;
+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;
- int omit_dir_times = 0;
  int update_only = 0;
 +int downdate_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -289,6 +290,7 @@ void usage(enum logcode F)
+@@ -671,6 +672,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," -d, --dirs                  transfer directories without recursing\n");
-@@ -462,6 +464,7 @@ static struct poptOption long_options[] 
-   {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
-   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
+   rprintf(F,"     --append-verify         like --append, but with old data in file checksum\n");
+@@ -892,6 +894,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 },
    {"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 },