1 To use this patch, run these commands for a successful build:
3 patch -p1 <patches/atimes.diff
5 ./configure (optional if already run)
11 @@ -56,6 +56,8 @@ void setup_protocol(int f_out,int f_in)
12 preserve_uid = ++file_extra_cnt;
14 preserve_gid = ++file_extra_cnt;
15 + if (preserve_atimes)
16 + preserve_atimes = ++file_extra_cnt;
18 if (remote_protocol == 0) {
22 @@ -48,6 +48,7 @@ extern int preserve_devices;
23 extern int preserve_specials;
24 extern int preserve_uid;
25 extern int preserve_gid;
26 +extern int preserve_atimes;
27 extern int relative_paths;
28 extern int implied_dirs;
29 extern int file_extra_cnt;
30 @@ -143,6 +144,7 @@ void show_flist_stats(void)
31 static void list_file_entry(struct file_struct *f)
33 char permbuf[PERMSTRING_SIZE];
34 + time_t atime = preserve_atimes ? F_ATIME(f) : 0;
37 if (!F_IS_ACTIVE(f)) {
38 @@ -155,14 +157,16 @@ static void list_file_entry(struct file_
41 if (preserve_links && S_ISLNK(f->mode)) {
42 - rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
43 + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
44 permbuf, len, timestring(f->modtime),
45 + preserve_atimes ? timestring(atime) : "",
46 f_name(f, NULL), F_SYMLINK(f));
50 - rprintf(FINFO, "%s %11.0f %s %s\n",
51 + rprintf(FINFO, "%s %11.0f %s %s %s\n",
52 permbuf, len, timestring(f->modtime),
53 + preserve_atimes ? timestring(atime) : "",
57 @@ -346,6 +350,7 @@ int push_flist_dir(const char *dir, int
58 static void send_file_entry(int f, struct file_struct *file, int ndx)
60 static time_t modtime;
61 + static time_t atime;
65 @@ -413,6 +418,13 @@ static void send_file_entry(int f, struc
66 flags |= XMIT_SAME_TIME;
68 modtime = file->modtime;
69 + if (preserve_atimes && !S_ISDIR(mode)) {
70 + time_t file_atime = F_ATIME(file);
71 + if (file_atime == atime)
72 + flags |= XMIT_SAME_ATIME;
77 #ifdef SUPPORT_HARD_LINKS
79 @@ -480,6 +492,8 @@ static void send_file_entry(int f, struc
80 write_int(f, modtime);
81 if (!(flags & XMIT_SAME_MODE))
82 write_int(f, to_wire_mode(mode));
83 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
84 + write_int(f, atime);
85 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
87 if (flags & XMIT_USER_NAME_FOLLOWS) {
88 @@ -553,7 +567,7 @@ static void send_file_entry(int f, struc
89 static struct file_struct *recv_file_entry(struct file_list *flist,
92 - static time_t modtime;
93 + static time_t modtime, atime;
97 @@ -650,6 +664,8 @@ static struct file_struct *recv_file_ent
98 modtime = (time_t)read_int(f);
99 if (!(flags & XMIT_SAME_MODE))
100 mode = from_wire_mode(read_int(f));
101 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
102 + atime = (time_t)read_int(f);
104 if (chmod_modes && !S_ISLNK(mode))
105 mode = tweak_mode(mode, chmod_modes);
106 @@ -758,6 +774,8 @@ static struct file_struct *recv_file_ent
110 + if (preserve_atimes)
111 + F_ATIME(file) = atime;
113 if (basename != thisname) {
114 file->dirname = lastdir;
115 @@ -1055,6 +1073,8 @@ struct file_struct *make_file(const char
116 F_OWNER(file) = st.st_uid;
118 F_GROUP(file) = st.st_gid;
119 + if (preserve_atimes)
120 + F_ATIME(file) = st.st_atime;
122 if (basename != thisname)
123 file->dirname = lastdir;
126 @@ -44,6 +44,7 @@ extern int preserve_perms;
127 extern int preserve_uid;
128 extern int preserve_gid;
129 extern int preserve_times;
130 +extern int preserve_atimes;
131 extern int omit_dir_times;
132 extern int delete_mode;
133 extern int delete_before;
134 @@ -539,6 +540,9 @@ void itemize(struct file_struct *file, i
135 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
136 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
137 iflags |= ITEM_REPORT_TIME;
138 + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
139 + && cmp_time(F_ATIME(file), st->st_atime) != 0)
140 + iflags |= ITEM_REPORT_ATIME;
141 if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
142 iflags |= ITEM_REPORT_PERMS;
143 if (preserve_uid && am_root && F_UID(file) != st->st_uid)
144 @@ -849,6 +853,8 @@ static int try_dests_reg(struct file_str
146 if (!hard_link_one(file, fname, cmpbuf, 1))
148 + if (preserve_atimes)
149 + set_file_attrs(fname, file, stp, 0);
150 if (preserve_hard_links && F_IS_HLINKED(file))
151 finish_hard_link(file, fname, stp, itemizing, code, j);
152 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
155 @@ -37,6 +37,7 @@ extern int msg_fd_out;
156 extern int allow_8bit_chars;
157 extern int protocol_version;
158 extern int preserve_times;
159 +extern int preserve_atimes;
160 extern int preserve_uid;
161 extern int preserve_gid;
162 extern int stdout_format_has_i;
163 @@ -625,7 +626,8 @@ static void log_formatted(enum logcode c
164 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
165 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
166 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
168 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
169 + : S_ISLNK(file->mode) ? 'U' : 'u';
172 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
175 @@ -55,6 +55,7 @@ int preserve_uid = 0;
176 int preserve_gid = 0;
177 int preserve_times = 0;
178 int omit_dir_times = 0;
179 +int preserve_atimes = 0;
183 @@ -307,8 +308,9 @@ void usage(enum logcode F)
184 rprintf(F," --devices preserve device files (super-user only)\n");
185 rprintf(F," --specials preserve special files\n");
186 rprintf(F," -D same as --devices --specials\n");
187 - rprintf(F," -t, --times preserve times\n");
188 - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
189 + rprintf(F," -t, --times preserve modify times\n");
190 + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
191 + rprintf(F," -U, --atimes preserve access (use) times\n");
192 rprintf(F," --super receiver attempts super-user activities\n");
193 rprintf(F," -S, --sparse handle sparse files efficiently\n");
194 rprintf(F," -n, --dry-run show what would have been transferred\n");
195 @@ -425,6 +427,9 @@ static struct poptOption long_options[]
196 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
197 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
198 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
199 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
200 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
201 + {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
202 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
203 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
204 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
205 @@ -1552,6 +1557,8 @@ void server_options(char **args,int *arg
209 + if (preserve_atimes)
213 else if (preserve_executability && am_sender)
216 @@ -34,6 +34,7 @@ extern int verbose;
218 extern int preserve_perms;
219 extern int preserve_executability;
220 +extern int preserve_atimes;
221 extern int preserve_times;
222 extern int omit_dir_times;
224 @@ -232,6 +233,7 @@ int set_file_attrs(char *fname, struct f
227 int change_uid, change_gid;
228 + time_t atime, mtime;
229 mode_t new_mode = file->mode;
232 @@ -251,18 +253,36 @@ int set_file_attrs(char *fname, struct f
236 + /* This code must be the first update in the function due to
237 + * how it uses the "updated" variable. */
238 if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
239 flags |= ATTRS_SKIP_MTIME;
240 + if (!preserve_atimes || S_ISDIR(st->st_mode))
241 + flags |= ATTRS_SKIP_ATIME;
242 if (!(flags & ATTRS_SKIP_MTIME)
243 && cmp_time(st->st_mtime, file->modtime) != 0) {
244 - int ret = set_modtime(fname, file->modtime, st->st_mode);
245 + mtime = file->modtime;
248 + mtime = st->st_mtime;
249 + if (!(flags & ATTRS_SKIP_ATIME)) {
250 + time_t file_atime = F_ATIME(file);
251 + if (cmp_time(st->st_atime, file_atime) != 0) {
252 + atime = file_atime;
255 + atime = st->st_atime;
257 + atime = st->st_atime;
259 + int ret = set_times(fname, mtime, atime, st->st_mode);
261 rsyserr(FERROR, errno, "failed to set times on %s",
265 - if (ret == 0) /* ret == 1 if symlink could not be set */
267 + if (ret > 0) /* ret == 1 if symlink could not be set */
271 change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
275 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
276 #define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */
277 #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */
278 +#define XMIT_SAME_ATIME (1<<14) /* protocols >= 30 */
280 /* These flags are used in the live flist data. */
284 #define ATTRS_REPORT (1<<0)
285 #define ATTRS_SKIP_MTIME (1<<1)
286 +#define ATTRS_SKIP_ATIME (1<<2)
289 #define NORMAL_FLUSH 0
290 @@ -565,6 +567,7 @@ struct file_struct {
291 extern int file_extra_cnt;
292 extern int preserve_uid;
293 extern int preserve_gid;
294 +extern int preserve_atimes;
296 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
297 #define EXTRA_LEN (sizeof (union file_extras))
298 @@ -597,6 +600,7 @@ extern int preserve_gid;
299 /* When the associated option is on, all entries will have these present: */
300 #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
301 #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
302 +#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
304 /* These items are per-entry optional and mutally exclusive: */
305 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
308 @@ -328,8 +328,9 @@ to the detailed description below for a
309 --devices preserve device files (super-user only)
310 --specials preserve special files
311 -D same as --devices --specials
312 - -t, --times preserve times
313 - -O, --omit-dir-times omit directories when preserving times
314 + -t, --times preserve modify times
315 + -O, --omit-dir-times omit directories when preserving mod-times
316 + -U, --atimes preserve access (use) times
317 --super receiver attempts super-user activities
318 -S, --sparse handle sparse files efficiently
319 -n, --dry-run show what would have been transferred
320 @@ -870,6 +871,12 @@ it is preserving modification times (see
321 the directories on the receiving side, it is a good idea to use bf(-O).
322 This option is inferred if you use bf(--backup) without bf(--backup-dir).
324 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
325 +destination files to the same value as the source files. Note that the
326 +reading of the source file may update the atime of the source files, so
327 +repeated rsync runs with --atimes may be needed if you want to force the
328 +access-time values to be 100% identical on the two systems.
330 dit(bf(--super)) This tells the receiving side to attempt super-user
331 activities even if the receiving rsync wasn't run by the super-user. These
332 activities include: preserving users via the bf(--owner) option, preserving
333 @@ -1403,7 +1410,7 @@ with older versions of rsync, but that a
336 The "%i" escape has a cryptic output that is 9 letters long. The general
337 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
338 +format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
339 type of update being done, bf(X) is replaced by the file-type, and the
340 other letters represent attributes that may be output if they are being
342 @@ -1443,7 +1450,7 @@ quote(itemization(
343 by the file transfer.
344 it() A bf(t) means the modification time is different and is being updated
345 to the sender's value (requires bf(--times)). An alternate value of bf(T)
346 - means that the time will be set to the transfer time, which happens
347 + means that the modify time will be set to the transfer time, which happens
348 anytime a symlink is transferred, or when a file or device is transferred
350 it() A bf(p) means the permissions are different and are being updated to
351 @@ -1452,7 +1459,10 @@ quote(itemization(
352 sender's value (requires bf(--owner) and super-user privileges).
353 it() A bf(g) means the group is different and is being updated to the
354 sender's value (requires bf(--group) and the authority to set the group).
355 - it() The bf(z) slot is reserved for future use.
356 + it() A bf(u) means the access (use) time is different and is being updated to
357 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
358 + means that the access time will be set to the transfer time, which happens
359 + when a symlink or directory is updated.
362 One other output is possible: when deleting files, the "%i" will output
365 @@ -42,6 +42,7 @@ extern int do_progress;
368 extern int write_batch;
369 +extern unsigned int file_struct_len;
370 extern struct stats stats;
371 extern struct file_list *cur_flist, *first_flist;
372 extern char *stdout_format;
373 --- old/testsuite/atimes.test
374 +++ new/testsuite/atimes.test
378 +# Test rsync copying atimes
380 +. "$suitedir/rsync.fns"
386 +touch "$fromdir/foo"
387 +touch -a -t 200102031717.42 "$fromdir/foo"
391 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
393 +# The script would have aborted on error, so getting here means we've won.
395 --- old/testsuite/rsync.fns
396 +++ new/testsuite/rsync.fns
397 @@ -66,7 +66,7 @@ printmsg() {
401 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
402 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
406 @@ -184,6 +184,10 @@ checkit() {
407 # We can just write everything to stdout/stderr, because the
408 # wrapper hides it unless there is a problem.
410 + if test x$TLS_ARGS = x--atime; then
411 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
414 echo "Running: \"$1\""
417 @@ -191,10 +195,13 @@ checkit() {
421 + if test x$TLS_ARGS != x--atime; then
422 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
426 echo "check how the directory listings compare with diff:"
428 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
429 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
430 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
440 #define PROGRAM "tls"
442 @@ -43,6 +44,8 @@ int read_only = 1;
444 int preserve_perms = 0;
446 +static int display_atime = 0;
448 static void failed(char const *what, char const *where)
450 fprintf(stderr, PROGRAM ": %s %s: %s\n",
451 @@ -50,12 +53,29 @@ static void failed(char const *what, cha
455 +static void storetime(char *dest, time_t t, size_t destsize)
458 + struct tm *mt = gmtime(&t);
460 + snprintf(dest, destsize,
461 + "%04d-%02d-%02d %02d:%02d:%02d ",
462 + (int)mt->tm_year + 1900,
463 + (int)mt->tm_mon + 1,
469 + strlcpy(dest, " ", destsize);
472 static void list_file(const char *fname)
475 char permbuf[PERMSTRING_SIZE];
482 if (do_lstat(fname, &buf) < 0)
483 @@ -88,19 +108,8 @@ static void list_file(const char *fname)
485 permstring(permbuf, buf.st_mode);
487 - if (buf.st_mtime) {
488 - mt = gmtime(&buf.st_mtime);
490 - snprintf(datebuf, sizeof datebuf,
491 - "%04d-%02d-%02d %02d:%02d:%02d",
492 - (int)mt->tm_year + 1900,
493 - (int)mt->tm_mon + 1,
499 - strlcpy(datebuf, " ", sizeof datebuf);
500 + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
501 + storetime(atimebuf, buf.st_atime, sizeof atimebuf);
503 /* TODO: Perhaps escape special characters in fname? */
505 @@ -111,23 +120,55 @@ static void list_file(const char *fname)
506 (long)minor(buf.st_rdev));
507 } else /* NB: use double for size since it might not fit in a long. */
508 printf("%12.0f", (double)buf.st_size);
509 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
510 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
511 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
512 - datebuf, fname, linkbuf);
513 + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
517 +static struct poptOption long_options[] = {
518 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
519 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
520 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
524 +static void tls_usage(int ret)
526 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] FILE ...\n"
527 + "Trivial file listing program for portably checking rsync\n");
532 main(int argc, char *argv[])
535 - fprintf(stderr, "usage: " PROGRAM " FILE ...\n"
536 - "Trivial file listing program for portably checking rsync\n");
540 + const char **extra_args;
543 - for (argv++; *argv; argv++) {
545 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
547 + while ((opt = poptGetNextOpt(pc)) != -1) {
554 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
555 + poptStrerror(opt));
560 + extra_args = poptGetArgs(pc);
561 + if (*extra_args == NULL)
564 + for (; *extra_args; extra_args++)
565 + list_file(*extra_args);
566 + poptFreeContext(pc);
572 @@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char *
573 exit_cleanup(RERR_MALLOC);
576 -int set_modtime(const char *fname, time_t modtime, mode_t mode)
577 +int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
579 #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
581 @@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_
585 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
586 + char mtimebuf[200];
588 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
590 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
591 fname, (long)modtime,
592 - asctime(localtime(&modtime)));
593 + mtimebuf, (long)atime, timestring(atime));
597 @@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_
601 - t[0].tv_sec = time(NULL);
602 + t[0].tv_sec = atime;
604 t[1].tv_sec = modtime;
606 @@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_
607 return utimes(fname, t);
608 #elif defined HAVE_UTIMBUF
610 - tbuf.actime = time(NULL);
611 + tbuf.actime = atime;
612 tbuf.modtime = modtime;
613 return utime(fname,&tbuf);
614 #elif defined HAVE_UTIME
619 return utime(fname,t);