1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118
|
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
--- old/generator.c
+++ new/generator.c
@@ -60,6 +60,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;
@@ -378,6 +379,8 @@ void itemize(struct file_struct *file, i
/* 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 cmp_time(st->st_mtime, file->modtime) == 0;
if (st->st_size != file->length)
return 0;
--- old/options.c
+++ new/options.c
@@ -99,6 +99,7 @@ int keep_partial = 0;
int safe_symlinks = 0;
int copy_unsafe_links = 0;
int size_only = 0;
+int date_only = 0;
int daemon_bwlimit = 0;
int bwlimit = 0;
int fuzzy_basis = 0;
@@ -343,6 +344,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");
+ rprintf(F," --date-only skip files that match in mod-time\n");
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");
@@ -463,6 +465,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 },
{"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 },
{"existing", 0, POPT_ARG_NONE, &ignore_non_existing, 0, 0, 0 },
@@ -1676,6 +1679,9 @@ void server_options(char **args,int *arg
args[ac++] = "--size-only";
}
+ if (date_only)
+ args[ac++] = "--date-only";
+
if (modify_window_set) {
if (asprintf(&arg, "--modify-window=%d", modify_window) < 0)
goto oom;
--- old/rsync.yo
+++ new/rsync.yo
@@ -360,6 +360,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
+ --date-only skip files that match in mod-time
--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
@@ -477,6 +478,12 @@ regardless of timestamp. This is useful
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
+--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.
+
dit(bf(--modify-window)) When comparing two timestamps, rsync treats the
timestamps as being equal if they differ by no more than the modify-window
value. This is normally 0 (for an exact match), but you may find it useful
--- old/rsync.1
+++ new/rsync.1
@@ -426,6 +426,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
+ \-\-date\-only skip files that match in mod-time
\-\-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
@@ -556,6 +557,13 @@ regardless of timestamp\&. This is usefu
after using another mirroring system which may not preserve timestamps
exactly\&.
.IP
+.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
.IP "\fB\-\-modify\-window\fP"
When comparing two timestamps, rsync treats the
timestamps as being equal if they differ by no more than the modify-window
|