| | 1 | Greetings, and thanks for all of your work on the wonderful rsync! |
| | 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 | Again, thanks! |
| | 12 | |
| | 13 | Best Regards, |
| | 14 | Jeremy Bornstein |
| | 15 | |
| | 16 | [Patched update to have context and apply to latest CVS source.] |
| | 17 | |
| | 18 | --- orig/generator.c 2005-01-25 12:14:14 |
| | 19 | +++ generator.c 2004-11-11 22:15:27 |
| | 20 | @@ -43,6 +43,7 @@ extern int inplace; |
| | 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 int io_timeout; |
| | 28 | @@ -81,6 +82,8 @@ static int unchanged_attrs(struct file_s |
| | 29 | /* Perform our quick-check heuristic for determining if a file is unchanged. */ |
| | 30 | static int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st) |
| | 31 | { |
| | 32 | + if (date_only) |
| | 33 | + return cmp_modtime(st->st_mtime, file->modtime) == 0; |
| | 34 | if (st->st_size != file->length) |
| | 35 | return 0; |
| | 36 | |
| | 37 | --- orig/options.c 2005-01-28 19:08:20 |
| | 38 | +++ options.c 2005-01-28 19:14:15 |
| | 39 | @@ -88,6 +88,7 @@ int keep_partial = 0; |
| | 40 | int safe_symlinks = 0; |
| | 41 | int copy_unsafe_links = 0; |
| | 42 | int size_only = 0; |
| | 43 | +int date_only = 0; |
| | 44 | int daemon_bwlimit = 0; |
| | 45 | int bwlimit = 0; |
| | 46 | size_t bwlimit_writemax = 0; |
| | 47 | @@ -298,6 +299,7 @@ void usage(enum logcode F) |
| | 48 | rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); |
| | 49 | rprintf(F," -I, --ignore-times don't skip files that match in size and mod-time\n"); |
| | 50 | rprintf(F," --size-only skip files that match in size\n"); |
| | 51 | + rprintf(F," --date-only skip files that match in mod-time\n"); |
| | 52 | rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\n"); |
| | 53 | rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); |
| | 54 | rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); |
| | 55 | @@ -352,6 +354,7 @@ static struct poptOption long_options[] |
| | 56 | {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, |
| | 57 | {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times, 0, 0, 0 }, |
| | 58 | {"size-only", 0, POPT_ARG_NONE, &size_only, 0, 0, 0 }, |
| | 59 | + {"date-only", 0, POPT_ARG_NONE, &date_only, 0, 0, 0 }, |
| | 60 | {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, |
| | 61 | {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, |
| | 62 | {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, |
| | 63 | @@ -1241,6 +1244,9 @@ void server_options(char **args,int *arg |
| | 64 | if (size_only) |
| | 65 | args[ac++] = "--size-only"; |
| | 66 | |
| | 67 | + if (date_only) |
| | 68 | + args[ac++] = "--date-only"; |
| | 69 | + |
| | 70 | if (modify_window_set) { |
| | 71 | if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) |
| | 72 | goto oom; |
| | 73 | --- orig/rsync.yo 2005-01-28 17:12:14 |
| | 74 | +++ rsync.yo 2005-01-28 19:14:37 |
| | 75 | @@ -360,6 +360,7 @@ verb( |
| | 76 | --timeout=TIME set I/O timeout in seconds |
| | 77 | -I, --ignore-times don't skip files that match size and time |
| | 78 | --size-only skip files that match in size |
| | 79 | + --date-only skip files that match in mod-time |
| | 80 | --modify-window=NUM compare mod-times with reduced accuracy |
| | 81 | -T --temp-dir=DIR create temporary files in directory DIR |
| | 82 | --compare-dest=DIR also compare received files relative to DIR |
| | 83 | @@ -448,6 +449,12 @@ regardless of timestamp. This is useful |
| | 84 | after using another mirroring system which may not preserve timestamps |
| | 85 | exactly. |
| | 86 | |
| | 87 | +dit(bf(--date-only)) Normally rsync will skip any files that are |
| | 88 | +already the same size and have the same modification time-stamp. With the |
| | 89 | +--date-only option, files will be skipped if they have the same |
| | 90 | +timestamp, regardless of size. This may be useful when the remote |
| | 91 | +files have passed through a size-changing filter, e.g. for encryption. |
| | 92 | + |
| | 93 | dit(bf(--modify-window)) When comparing two timestamps rsync treats |
| | 94 | the timestamps as being equal if they are within the value of |
| | 95 | modify_window. This is normally zero, but you may find it useful to |
Matt McCutchen's Web Site / rsync / rsync-patches.git / blame_incremental