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 | ||
f635ed27 | 18 | --- orig/generator.c 2004-08-05 18:24:21 |
13bed3dd | 19 | +++ generator.c 2004-07-03 20:16:51 |
7628f156 WD |
20 | @@ -39,6 +39,7 @@ extern int opt_ignore_existing; |
21 | extern int csum_length; | |
22 | extern int ignore_times; | |
23 | extern int size_only; | |
c66bc26c | 24 | +extern int date_only; |
7628f156 WD |
25 | extern int io_timeout; |
26 | extern int protocol_version; | |
27 | extern int always_checksum; | |
f6c3b300 | 28 | @@ -60,6 +61,8 @@ extern struct exclude_list_struct server |
c66bc26c WD |
29 | /* choose whether to skip a particular file */ |
30 | static int skip_file(char *fname, struct file_struct *file, STRUCT_STAT *st) | |
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; |
8cec1ead | 36 | if (link_dest) { |
67c08134 | 37 | --- orig/options.c 2004-08-12 18:34:38 |
13bed3dd | 38 | +++ options.c 2004-07-03 20:16:51 |
7628f156 | 39 | @@ -84,6 +84,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; | |
44 | int bwlimit = 0; | |
78114162 | 45 | size_t bwlimit_writemax = 0; |
c66bc26c | 46 | int delete_after = 0; |
f635ed27 | 47 | @@ -275,6 +276,7 @@ void usage(enum logcode F) |
c66bc26c WD |
48 | rprintf(F," --timeout=TIME set I/O timeout in seconds\n"); |
49 | rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n"); | |
50 | rprintf(F," --size-only ignore mod time for quick check (use size)\n"); | |
51 | + rprintf(F," --date-only ignore size for quick check (use 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"); |
c66bc26c | 54 | rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n"); |
f635ed27 | 55 | @@ -330,6 +332,7 @@ static struct poptOption long_options[] |
ea238f1c | 56 | {"password-file", 0, POPT_ARG_STRING, &password_file, 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 }, | |
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 | {"delete", 0, POPT_ARG_NONE, &delete_mode, 0, 0, 0 }, | |
f635ed27 | 63 | @@ -1025,6 +1028,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; |
67c08134 | 73 | --- orig/rsync.yo 2004-08-13 07:18:59 |
13bed3dd | 74 | +++ rsync.yo 2004-07-03 20:16:51 |
67c08134 | 75 | @@ -352,6 +352,7 @@ verb( |
c66bc26c WD |
76 | --timeout=TIME set I/O timeout in seconds |
77 | -I, --ignore-times turn off mod time & file size quick check | |
78 | --size-only ignore mod time for quick check (use size) | |
79 | + --date-only ignore size for quick check (use 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 | |
67c08134 | 83 | @@ -426,6 +427,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 | + |
c66bc26c WD |
93 | dit(bf(--modify-window)) When comparing two timestamps rsync treats |
94 | the timestamps as being equal if they are within the value of | |
78114162 | 95 | modify_window. This is normally zero, but you may find it useful to |