Return to date-only.diff CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / patches

rsync 3.2.3

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).
This is because I'm backing up files remotely on an untrusted machine,
so I'm encrypting them with gpg before transfer.  I discovered that
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.

To use this patch, run these commands for a successful build:

    patch -p1 <patches/date-only.diff
    ./configure                                 (optional if already run)
    make

based-on: e94bad1c156fc3910f24e2b3b71a81b0b0bdeb70
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@ -65,6 +65,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 OFF_T min_size;
@@ -603,6 +604,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
 /* Perform our quick-check heuristic for determining if a file is unchanged. */
 int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
 {
+	if (date_only)
+		return !mtime_differs(st, file);
+
 	if (st->st_size != F_LENGTH(file))
 		return 0;
 
diff --git a/options.c b/options.c
--- a/options.c
+++ b/options.c
@@ -110,6 +110,7 @@ int safe_symlinks = 0;
 int copy_unsafe_links = 0;
 int munge_symlinks = 0;
 int size_only = 0;
+int date_only = 0;
 int daemon_bwlimit = 0;
 int bwlimit = 0;
 int fuzzy_basis = 0;
@@ -679,6 +680,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 },
   {"one-file-system", 'x', POPT_ARG_NONE,   0, 'x', 0, 0 },
   {"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 },
@@ -2782,6 +2784,9 @@ void server_options(char **args, int *argc_p)
 	else if (missing_args == 1 && !am_sender)
 		args[ac++] = "--ignore-missing-args";
 
+	if (date_only)
+		args[ac++] = "--date-only";
+
 	if (modify_window_set && am_sender) {
 		char *fmt = modify_window < 0 ? "-@%d" : "--modify-window=%d";
 		if (asprintf(&arg, fmt, modify_window) < 0)
diff --git a/rsync.1.md b/rsync.1.md
--- a/rsync.1.md
+++ b/rsync.1.md
@@ -418,6 +418,7 @@ detailed description below for a complete description.
 --contimeout=SECONDS     set daemon connection timeout in seconds
 --ignore-times, -I       don't skip files that match size and time
 --size-only              skip files that match in size
+--date-only              skip files that match in mod-time
 --modify-window=NUM, -@  set the accuracy for mod-time comparisons
 --temp-dir=DIR, -T       create temporary files in directory DIR
 --fuzzy, -y              find similar file for basis if no dest file
@@ -660,6 +661,14 @@ your home directory (remove the '=' for that).
     after using another mirroring system which may not preserve timestamps
     exactly.
 
+0.  `--date-only`
+
+    Normally rsync will skip any files that are already the same size and have
+    the same modification time-stamp. With the --date-only option, files will
+    be skipped if they have the same timestamp, regardless of size. This may be
+    useful when the remote files have passed through a size-changing filter,
+    e.g. for encryption.
+
 0.  `--modify-window=NUM`, `-@`
 
     When comparing two timestamps, rsync treats the timestamps as being equal
diff -Nurp a/rsync.1 b/rsync.1
--- a/rsync.1
+++ b/rsync.1
@@ -494,6 +494,7 @@ detailed description below for a complet
 --contimeout=SECONDS     set daemon connection timeout in seconds
 --ignore-times, -I       don't skip files that match size and time
 --size-only              skip files that match in size
+--date-only              skip files that match in mod-time
 --modify-window=NUM, -@  set the accuracy for mod-time comparisons
 --temp-dir=DIR, -T       create temporary files in directory DIR
 --fuzzy, -y              find similar file for basis if no dest file
@@ -727,6 +728,12 @@ either a changed size or a changed last-
 files that have changed in size.  This is useful when starting to use rsync
 after using another mirroring system which may not preserve timestamps
 exactly.
+.IP "\fB\-\-date-only\fP"
+Normally rsync will skip any files that are already the same size and have
+the same modification time-stamp. With the \-\-date-only option, files will
+be skipped if they have the same timestamp, regardless of size. This may be
+useful when the remote files have passed through a size-changing filter,
+e.g. for encryption.
 .IP "\fB\-\-modify-window=NUM\fP, \fB\-@\fP"
 When comparing two timestamps, rsync treats the timestamps as being equal
 if they differ by no more than the modify-window value.  The default is 0,
diff -Nurp a/rsync.1.html b/rsync.1.html
--- a/rsync.1.html
+++ b/rsync.1.html
@@ -409,6 +409,7 @@ detailed description below for a complet
 --contimeout=SECONDS     set daemon connection timeout in seconds
 --ignore-times, -I       don't skip files that match size and time
 --size-only              skip files that match in size
+--date-only              skip files that match in mod-time
 --modify-window=NUM, -@  set the accuracy for mod-time comparisons
 --temp-dir=DIR, -T       create temporary files in directory DIR
 --fuzzy, -y              find similar file for basis if no dest file
@@ -646,6 +647,14 @@ after using another mirroring system whi
 exactly.</p>
 </dd>
 
+<dt><code>--date-only</code></dt><dd>
+<p>Normally rsync will skip any files that are already the same size and have
+the same modification time-stamp. With the -&#8288;-&#8288;date-only option, files will
+be skipped if they have the same timestamp, regardless of size. This may be
+useful when the remote files have passed through a size-changing filter,
+e.g. for encryption.</p>
+</dd>
+
 <dt><code>--modify-window=NUM</code>, <code>-@</code></dt><dd>
 <p>When comparing two timestamps, rsync treats the timestamps as being equal
 if they differ by no more than the modify-window value.  The default is 0,