| 1 | Jeremy Bornstein wrote: |
| 2 | |
| 3 | I recently had the need to transfer files only with different mod |
| 4 | dates (and to *not* transfer them based on file size differences). |
| 5 | This is because I'm backing up files remotely on an untrusted machine, |
| 6 | so I'm encrypting them with gpg before transfer. I discovered that |
| 7 | rsync didn't already have a --date-only flag, so I added one and am |
| 8 | enclosing the diffs in case you (as I hope) decide to include this |
| 9 | option in future releases. |
| 10 | |
| 11 | To use this patch, run these commands for a successful build: |
| 12 | |
| 13 | patch -p1 <patches/date-only.diff |
| 14 | ./configure (optional if already run) |
| 15 | make |
| 16 | |
| 17 | diff --git a/generator.c b/generator.c |
| 18 | --- a/generator.c |
| 19 | +++ b/generator.c |
| 20 | @@ -62,6 +62,7 @@ extern int append_mode; |
| 21 | extern int make_backups; |
| 22 | extern int csum_length; |
| 23 | extern int ignore_times; |
| 24 | +extern int date_only; |
| 25 | extern int size_only; |
| 26 | extern OFF_T max_size; |
| 27 | extern OFF_T min_size; |
| 28 | @@ -717,6 +718,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre |
| 29 | /* Perform our quick-check heuristic for determining if a file is unchanged. */ |
| 30 | int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) |
| 31 | { |
| 32 | + if (date_only) |
| 33 | + return cmp_time(st->st_mtime, file->modtime) == 0; |
| 34 | + |
| 35 | if (st->st_size != F_LENGTH(file)) |
| 36 | return 0; |
| 37 | |
| 38 | diff --git a/options.c b/options.c |
| 39 | --- a/options.c |
| 40 | +++ b/options.c |
| 41 | @@ -106,6 +106,7 @@ int keep_partial = 0; |
| 42 | int safe_symlinks = 0; |
| 43 | int copy_unsafe_links = 0; |
| 44 | int size_only = 0; |
| 45 | +int date_only = 0; |
| 46 | int daemon_bwlimit = 0; |
| 47 | int bwlimit = 0; |
| 48 | int fuzzy_basis = 0; |
| 49 | @@ -389,6 +390,7 @@ void usage(enum logcode F) |
| 50 | rprintf(F," --contimeout=SECONDS set daemon connection timeout in seconds\n"); |
| 51 | rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); |
| 52 | rprintf(F," --size-only skip files that match in size\n"); |
| 53 | + rprintf(F," --date-only skip files that match in mod-time\n"); |
| 54 | rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); |
| 55 | rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); |
| 56 | rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); |
| 57 | @@ -531,6 +533,7 @@ static struct poptOption long_options[] = { |
| 58 | {"chmod", 0, POPT_ARG_STRING, 0, OPT_CHMOD, 0, 0 }, |
| 59 | {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, |
| 60 | {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, |
| 61 | + {"date-only", 0, POPT_ARG_NONE, &date_only, 0, 0, 0 }, |
| 62 | {"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 }, |
| 63 | {"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, |
| 64 | {"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 }, |
| 65 | @@ -1969,6 +1972,9 @@ void server_options(char **args, int *argc_p) |
| 66 | } |
| 67 | } |
| 68 | |
| 69 | + if (date_only) |
| 70 | + args[ac++] = "--date-only"; |
| 71 | + |
| 72 | if (modify_window_set) { |
| 73 | if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) |
| 74 | goto oom; |
| 75 | diff --git a/rsync.yo b/rsync.yo |
| 76 | --- a/rsync.yo |
| 77 | +++ b/rsync.yo |
| 78 | @@ -386,6 +386,7 @@ to the detailed description below for a complete description. verb( |
| 79 | --contimeout=SECONDS set daemon connection timeout in seconds |
| 80 | -I, --ignore-times don't skip files that match size and time |
| 81 | --size-only skip files that match in size |
| 82 | + --date-only skip files that match in mod-time |
| 83 | --modify-window=NUM compare mod-times with reduced accuracy |
| 84 | -T, --temp-dir=DIR create temporary files in directory DIR |
| 85 | -y, --fuzzy find similar file for basis if no dest file |
| 86 | @@ -506,6 +507,12 @@ time to just looking for files that have changed in size. This is useful |
| 87 | when starting to use rsync after using another mirroring system which may |
| 88 | not preserve timestamps exactly. |
| 89 | |
| 90 | +dit(bf(--date-only)) Normally rsync will skip any files that are |
| 91 | +already the same size and have the same modification time-stamp. With the |
| 92 | +--date-only option, files will be skipped if they have the same |
| 93 | +timestamp, regardless of size. This may be useful when the remote |
| 94 | +files have passed through a size-changing filter, e.g. for encryption. |
| 95 | + |
| 96 | dit(bf(--modify-window)) When comparing two timestamps, rsync treats the |
| 97 | timestamps as being equal if they differ by no more than the modify-window |
| 98 | value. This is normally 0 (for an exact match), but you may find it useful |