Commit | Line | Data |
---|---|---|
07b2cce7 MP |
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 | |
c66bc26c WD |
15 | |
16 | [Patched update to have context and apply to latest CVS source.] | |
17 | ||
489b0a72 | 18 | --- orig/generator.c 2005-08-17 06:45:07 |
58a9031f | 19 | +++ generator.c 2004-11-11 22:15:27 |
489b0a72 | 20 | @@ -58,6 +58,7 @@ extern int append_mode; |
58a9031f | 21 | extern int make_backups; |
7628f156 WD |
22 | extern int csum_length; |
23 | extern int ignore_times; | |
c66bc26c | 24 | +extern int date_only; |
58a9031f WD |
25 | extern int size_only; |
26 | extern OFF_T max_size; | |
1a2bc9cd | 27 | extern int io_error; |
489b0a72 | 28 | @@ -360,6 +361,8 @@ void itemize(struct file_struct *file, i |
4c1f2ca5 WD |
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) | |
c66bc26c WD |
31 | { |
32 | + if (date_only) | |
8cec1ead WD |
33 | + return cmp_modtime(st->st_mtime, file->modtime) == 0; |
34 | if (st->st_size != file->length) | |
c66bc26c | 35 | return 0; |
4c1f2ca5 | 36 | |
489b0a72 WD |
37 | --- orig/options.c 2005-08-27 21:11:26 |
38 | +++ options.c 2005-08-27 21:19:31 | |
388bf7cc | 39 | @@ -90,6 +90,7 @@ int keep_partial = 0; |
c66bc26c WD |
40 | int safe_symlinks = 0; |
41 | int copy_unsafe_links = 0; | |
42 | int size_only = 0; | |
43 | +int date_only = 0; | |
bad31232 | 44 | int daemon_bwlimit = 0; |
c66bc26c | 45 | int bwlimit = 0; |
a5e0f697 | 46 | int fuzzy_basis = 0; |
489b0a72 | 47 | @@ -316,6 +317,7 @@ void usage(enum logcode F) |
c66bc26c | 48 | rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); |
79f132a1 WD |
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"); | |
d4e89c6a | 53 | rprintf(F," -T, --temp-dir=DIR create temporary files in directory DIR\n"); |
a5e0f697 | 54 | rprintf(F," -y, --fuzzy find similar file for basis if no dest file\n"); |
489b0a72 WD |
55 | @@ -413,6 +415,7 @@ static struct poptOption long_options[] |
56 | {"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 }, | |
c66bc26c WD |
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 }, | |
c66bc26c | 60 | {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system, 0, 0, 0 }, |
489b0a72 | 61 | {"update", 'u', POPT_ARG_NONE, &update_only, 0, 0, 0 }, |
ac23c334 | 62 | {"existing", 0, POPT_ARG_NONE, &only_existing, 0, 0, 0 }, |
489b0a72 | 63 | @@ -1445,6 +1448,9 @@ void server_options(char **args,int *arg |
c66bc26c WD |
64 | if (size_only) |
65 | args[ac++] = "--size-only"; | |
78114162 | 66 | |
c66bc26c WD |
67 | + if (date_only) |
68 | + args[ac++] = "--date-only"; | |
78114162 | 69 | + |
c66bc26c WD |
70 | if (modify_window_set) { |
71 | if (asprintf(&arg, "--modify-window=%d", modify_window) < 0) | |
78114162 | 72 | goto oom; |
489b0a72 | 73 | --- orig/rsync.yo 2005-08-27 21:05:12 |
c1adaf30 | 74 | +++ rsync.yo 2005-02-11 22:49:10 |
e33d747e | 75 | @@ -350,6 +350,7 @@ to the detailed description below for a |
c66bc26c | 76 | --timeout=TIME set I/O timeout in seconds |
79f132a1 WD |
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 | |
ed1e6fe4 | 81 | -T, --temp-dir=DIR create temporary files in directory DIR |
a5e0f697 | 82 | -y, --fuzzy find similar file for basis if no dest file |
489b0a72 | 83 | @@ -448,6 +449,12 @@ regardless of timestamp. This is useful |
c66bc26c WD |
84 | after using another mirroring system which may not preserve timestamps |
85 | exactly. | |
78114162 | 86 | |
c66bc26c WD |
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. | |
78114162 | 92 | + |
c1adaf30 WD |
93 | dit(bf(--modify-window)) When comparing two timestamps, rsync treats the |
94 | timestamps as being equal if they differ by no more than the modify-window | |
95 | value. This is normally 0 (for an exact match), but you may find it useful |