X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=downdate.diff;h=47e344fafde3dba729630e2b79e2e7f9c7850733;hb=refs%2Fheads%2Fb3.0.x;hp=eafed0ead2f1e69c99a73e98f170b19ff324ee90;hpb=9127013998bd097f699897b0f2b142fe2ba71e9d;p=rsync.git%2Fpatches.git

diff --git a/downdate.diff b/downdate.diff
index eafed0e..47e344f 100644
--- a/downdate.diff
+++ b/downdate.diff
@@ -7,10 +7,11 @@ To use this patch, run these commands for a successful build:
     ./configure                                 (optional if already run)
     make
 
+based-on: 40afd365cc8ca968fd16e161d24df5b8a8a520cc
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
-@@ -55,6 +55,7 @@ extern int ignore_errors;
+@@ -53,6 +53,7 @@ extern int ignore_errors;
  extern int remove_source_files;
  extern int delay_updates;
  extern int update_only;
@@ -18,21 +19,20 @@ diff --git a/generator.c b/generator.c
  extern int ignore_existing;
  extern int ignore_non_existing;
  extern int inplace;
-@@ -1705,6 +1706,13 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
+@@ -1786,6 +1787,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 (downdate_only && statret == 0 && cmp_time(sx.st.st_mtime, file->modtime) < 0) {
 +		if (verbose > 1)
 +			rprintf(FINFO, "%s is older\n", fname);
 +		return;
 +	}
 +
- 	fnamecmp = fname;
  	fnamecmp_type = FNAMECMP_FNAME;
  
-@@ -2065,6 +2073,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+ 	if (statret == 0 && !S_ISREG(sx.st.st_mode)) {
+@@ -2165,6 +2172,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;
-@@ -2090,6 +2099,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -2190,6 +2198,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;
@@ -59,7 +59,7 @@ diff --git a/options.c b/options.c
  int cvs_exclude = 0;
  int dry_run = 0;
  int do_xfers = 1;
-@@ -326,6 +327,7 @@ void usage(enum logcode F)
+@@ -325,6 +326,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");
@@ -67,9 +67,9 @@ diff --git a/options.c b/options.c
    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 },
+@@ -533,6 +535,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 },