X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/1a2bc9cd5090ca968629f4c4a4915a8e49231386..6dca00254adc64ba87f07ff1c959766a67d764c7:/date-only.diff

diff --git a/date-only.diff b/date-only.diff
index 648a9be..f2dd735 100644
--- a/date-only.diff
+++ b/date-only.diff
@@ -1,4 +1,4 @@
-Greetings, and thanks for all of your work on the wonderful rsync!
+Jeremy Bornstein wrote:
 
 I recently had the need to transfer files only with different mod
 dates (and to *not* transfer them based on file size differences).
@@ -8,35 +8,35 @@ rsync didn't already have a --date-only flag, so I added one and am
 enclosing the diffs in case you (as I hope) decide to include this
 option in future releases.
 
-Again, thanks!
+To use this patch, run these commands for a successful build:
 
-Best Regards,
-Jeremy Bornstein
+    patch -p1 <patches/date-only.diff
+    ./configure                                 (optional if already run)
+    make
 
-[Patched update to have context and apply to latest CVS source.]
-
---- orig/generator.c	2005-05-19 08:52:42
-+++ generator.c	2004-11-11 22:15:27
-@@ -57,6 +57,7 @@ extern int inplace;
+--- old/generator.c
++++ new/generator.c
+@@ -61,6 +61,7 @@ extern int append_mode;
  extern int make_backups;
  extern int csum_length;
  extern int ignore_times;
 +extern int date_only;
  extern int size_only;
  extern OFF_T max_size;
- extern int io_error;
-@@ -361,6 +362,8 @@ void itemize(struct file_struct *file, i
+ extern OFF_T min_size;
+@@ -619,6 +620,9 @@ void itemize(const char *fnamecmp, struc
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
- static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
+ int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
 +	if (date_only)
-+		return cmp_modtime(st->st_mtime, file->modtime) == 0;
- 	if (st->st_size != file->length)
++		return cmp_time(st->st_mtime, file->modtime) == 0;
++
+ 	if (st->st_size != F_LENGTH(file))
  		return 0;
  
---- orig/options.c	2005-05-19 08:52:42
-+++ options.c	2005-01-28 19:14:15
-@@ -90,6 +90,7 @@ int keep_partial = 0;
+--- old/options.c
++++ new/options.c
+@@ -103,6 +103,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
@@ -44,7 +44,7 @@ Jeremy Bornstein
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -315,6 +316,7 @@ void usage(enum logcode F)
+@@ -380,6 +381,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
@@ -52,17 +52,17 @@ Jeremy Bornstein
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
-@@ -374,6 +376,7 @@ static struct poptOption long_options[] 
-   {"password-file",    0,  POPT_ARG_STRING, &password_file, 0, 0, 0 },
+@@ -520,6 +522,7 @@ static struct poptOption long_options[] 
+   {"chmod",            0,  POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 },
    {"ignore-times",    'I', POPT_ARG_NONE,   &ignore_times, 0, 0, 0 },
    {"size-only",        0,  POPT_ARG_NONE,   &size_only, 0, 0, 0 },
 +  {"date-only",        0,  POPT_ARG_NONE,   &date_only, 0, 0, 0 },
-   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
-   {"one-file-system", 'x', POPT_ARG_NONE,   &one_file_system, 0, 0, 0 },
-   {"existing",         0,  POPT_ARG_NONE,   &only_existing, 0, 0, 0 },
-@@ -1398,6 +1401,9 @@ void server_options(char **args,int *arg
- 	if (size_only)
- 		args[ac++] = "--size-only";
+   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
+   {"update",          'u', POPT_ARG_NONE,   &update_only, 0, 0, 0 },
+   {"existing",         0,  POPT_ARG_NONE,   &ignore_non_existing, 0, 0, 0 },
+@@ -1897,6 +1900,9 @@ void server_options(char **args, int *ar
+ 		}
+ 	}
  
 +	if (date_only)
 +		args[ac++] = "--date-only";
@@ -70,9 +70,9 @@ Jeremy Bornstein
  	if (modify_window_set) {
  		if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
  			goto oom;
---- orig/rsync.yo	2005-05-10 23:47:12
-+++ rsync.yo	2005-02-11 22:49:10
-@@ -350,6 +350,7 @@ to the detailed description below for a 
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -382,6 +382,7 @@ to the detailed description below for a 
       --timeout=TIME          set I/O timeout in seconds
   -I, --ignore-times          don't skip files that match size and time
       --size-only             skip files that match in size
@@ -80,9 +80,9 @@ Jeremy Bornstein
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
-@@ -449,6 +450,12 @@ regardless of timestamp. This is useful 
- after using another mirroring system which may not preserve timestamps
- exactly.
+@@ -502,6 +503,12 @@ time to just looking for files that have
+ when starting to use rsync after using another mirroring system which may
+ not preserve timestamps exactly.
  
 +dit(bf(--date-only)) Normally rsync will skip any files that are
 +already the same size and have the same modification time-stamp. With the