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 @@ -46,6 +46,7 @@ extern int preserve_devices;
12 extern int preserve_specials;
13 extern int preserve_uid;
14 extern int preserve_gid;
15 +extern int preserve_atimes;
16 extern int relative_paths;
17 extern int implied_dirs;
18 extern int flist_extra_cnt;
19 @@ -137,6 +138,7 @@ void show_flist_stats(void)
20 static void list_file_entry(struct file_struct *f)
22 char permbuf[PERMSTRING_SIZE];
23 + time_t atime = preserve_atimes ? F_ATIME(f) : 0;
26 if (!F_IS_ACTIVE(f)) {
27 @@ -149,14 +151,16 @@ static void list_file_entry(struct file_
30 if (preserve_links && S_ISLNK(f->mode)) {
31 - rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
32 + rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
33 permbuf, len, timestring(f->modtime),
34 + preserve_atimes ? timestring(atime) : "",
35 f_name(f, NULL), F_SYMLINK(f));
39 - rprintf(FINFO, "%s %11.0f %s %s\n",
40 + rprintf(FINFO, "%s %11.0f %s %s %s\n",
41 permbuf, len, timestring(f->modtime),
42 + preserve_atimes ? timestring(atime) : "",
46 @@ -314,6 +318,7 @@ static void send_file_entry(struct file_
49 static time_t modtime;
50 + static time_t atime;
54 @@ -367,6 +372,13 @@ static void send_file_entry(struct file_
55 flags |= XMIT_SAME_TIME;
57 modtime = file->modtime;
58 + if (preserve_atimes && !S_ISDIR(mode)) {
59 + time_t file_atime = F_ATIME(file);
60 + if (file_atime == atime)
61 + flags |= XMIT_SAME_ATIME;
66 #ifdef SUPPORT_HARD_LINKS
67 if (tmp_idev.dev != 0) {
68 @@ -434,6 +446,8 @@ static void send_file_entry(struct file_
69 write_int(f, modtime);
70 if (!(flags & XMIT_SAME_MODE))
71 write_int(f, to_wire_mode(mode));
72 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
73 + write_int(f, atime);
74 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
77 @@ -501,7 +515,7 @@ static void send_file_entry(struct file_
78 static struct file_struct *recv_file_entry(struct file_list *flist,
79 unsigned short flags, int f)
81 - static time_t modtime;
82 + static time_t modtime, atime;
86 @@ -522,7 +536,7 @@ static struct file_struct *recv_file_ent
87 struct file_struct *file;
90 - modtime = 0, mode = 0;
91 + modtime = 0, atime = 0, mode = 0;
92 dev = 0, rdev = MAKEDEV(0, 0);
95 @@ -610,6 +624,8 @@ static struct file_struct *recv_file_ent
96 modtime = (time_t)read_int(f);
97 if (!(flags & XMIT_SAME_MODE))
98 mode = from_wire_mode(read_int(f));
99 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
100 + atime = (time_t)read_int(f);
102 if (chmod_modes && !S_ISLNK(mode))
103 mode = tweak_mode(mode, chmod_modes);
104 @@ -695,6 +711,8 @@ static struct file_struct *recv_file_ent
108 + if (preserve_atimes)
109 + F_ATIME(file) = atime;
112 file->dirname = lastdir = bp;
113 @@ -985,6 +1003,8 @@ struct file_struct *make_file(const char
114 F_UID(file) = st.st_uid;
116 F_GID(file) = st.st_gid;
117 + if (preserve_atimes)
118 + F_ATIME(file) = st.st_atime;
121 file->dirname = lastdir = bp;
124 @@ -43,6 +43,7 @@ extern int preserve_perms;
125 extern int preserve_uid;
126 extern int preserve_gid;
127 extern int preserve_times;
128 +extern int preserve_atimes;
129 extern int omit_dir_times;
130 extern int delete_mode;
131 extern int delete_before;
132 @@ -547,6 +548,9 @@ void itemize(struct file_struct *file, i
133 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
134 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
135 iflags |= ITEM_REPORT_TIME;
136 + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
137 + && cmp_time(F_ATIME(file), st->st_atime) != 0)
138 + iflags |= ITEM_REPORT_ATIME;
139 if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
140 iflags |= ITEM_REPORT_PERMS;
141 if (preserve_uid && am_root && F_UID(file) != st->st_uid)
142 @@ -858,6 +862,8 @@ static int try_dests_reg(struct file_str
144 if (!hard_link_one(file, fname, cmpbuf, 1))
146 + if (preserve_atimes)
147 + set_file_attrs(fname, file, stp, 0);
148 if (preserve_hard_links && F_IS_HLINKED(file))
149 finish_hard_link(file, fname, stp, itemizing, code, j);
150 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
153 @@ -37,6 +37,7 @@ extern int msg_fd_out;
154 extern int allow_8bit_chars;
155 extern int protocol_version;
156 extern int preserve_times;
157 +extern int preserve_atimes;
158 extern int preserve_uid;
159 extern int preserve_gid;
160 extern int stdout_format_has_i;
161 @@ -625,7 +626,8 @@ static void log_formatted(enum logcode c
162 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
163 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
164 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
166 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
167 + : S_ISLNK(file->mode) ? 'U' : 'u';
170 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
173 @@ -55,6 +55,7 @@ int preserve_uid = 0;
174 int preserve_gid = 0;
175 int preserve_times = 0;
176 int omit_dir_times = 0;
177 +int preserve_atimes = 0;
181 @@ -307,8 +308,9 @@ void usage(enum logcode F)
182 rprintf(F," --devices preserve device files (super-user only)\n");
183 rprintf(F," --specials preserve special files\n");
184 rprintf(F," -D same as --devices --specials\n");
185 - rprintf(F," -t, --times preserve times\n");
186 - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
187 + rprintf(F," -t, --times preserve modify times\n");
188 + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
189 + rprintf(F," -U, --atimes preserve access (use) times\n");
190 rprintf(F," --super receiver attempts super-user activities\n");
191 rprintf(F," -S, --sparse handle sparse files efficiently\n");
192 rprintf(F," -n, --dry-run show what would have been transferred\n");
193 @@ -425,6 +427,9 @@ static struct poptOption long_options[]
194 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
195 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
196 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
197 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
198 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
199 + {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
200 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
201 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
202 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
203 @@ -1223,6 +1228,8 @@ int parse_arguments(int *argc, const cha
204 preserve_uid = ++flist_extra_cnt;
206 preserve_gid = ++flist_extra_cnt;
207 + if (preserve_atimes)
208 + preserve_atimes = ++flist_extra_cnt;
210 *argv = poptGetArgs(pc);
211 *argc = count_args(*argv);
212 @@ -1542,6 +1549,8 @@ void server_options(char **args,int *arg
216 + if (preserve_atimes)
220 else if (preserve_executability && am_sender)
223 @@ -34,6 +34,7 @@ extern int verbose;
225 extern int preserve_perms;
226 extern int preserve_executability;
227 +extern int preserve_atimes;
228 extern int preserve_times;
229 extern int omit_dir_times;
231 @@ -182,6 +183,7 @@ int set_file_attrs(char *fname, struct f
234 int change_uid, change_gid;
235 + time_t atime, mtime;
236 mode_t new_mode = file->mode;
239 @@ -201,18 +203,36 @@ int set_file_attrs(char *fname, struct f
243 + /* This code must be the first update in the function due to
244 + * how it uses the "updated" variable. */
245 if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
246 flags |= ATTRS_SKIP_MTIME;
247 + if (!preserve_atimes || S_ISDIR(st->st_mode))
248 + flags |= ATTRS_SKIP_ATIME;
249 if (!(flags & ATTRS_SKIP_MTIME)
250 && cmp_time(st->st_mtime, file->modtime) != 0) {
251 - int ret = set_modtime(fname, file->modtime, st->st_mode);
252 + mtime = file->modtime;
255 + mtime = st->st_mtime;
256 + if (!(flags & ATTRS_SKIP_ATIME)) {
257 + time_t file_atime = F_ATIME(file);
258 + if (cmp_time(st->st_atime, file_atime) != 0) {
259 + atime = file_atime;
262 + atime = st->st_atime;
264 + atime = st->st_atime;
266 + int ret = set_times(fname, mtime, atime, st->st_mode);
268 rsyserr(FERROR, errno, "failed to set times on %s",
272 - if (ret == 0) /* ret == 1 if symlink could not be set */
274 + if (ret > 0) /* ret == 1 if symlink could not be set */
278 change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
282 #define XMIT_SAME_DEV_pre30 (1<<10) /* protocols < 30 */
283 #define XMIT_HLINK_FIRST (1<<10) /* protocols >= 30 */
284 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
285 +#define XMIT_SAME_ATIME (1<<12)
287 /* These flags are used in the live flist data. */
291 #define ATTRS_REPORT (1<<0)
292 #define ATTRS_SKIP_MTIME (1<<1)
293 +#define ATTRS_SKIP_ATIME (1<<2)
296 #define NORMAL_FLUSH 0
297 @@ -514,6 +516,7 @@ struct file_struct {
299 uid_t uid; /* The user ID number */
300 uid_t gid; /* The group ID number or GID_NONE */
301 + time_t utime; /* A unix-time value */
302 struct idev *idev; /* The hard-link info during matching */
303 int32 num; /* A signed number */
304 uint32 unum; /* An unsigned number */
305 @@ -559,6 +562,7 @@ extern int preserve_gid;
306 /* When the associated option is on, all entries will have these present: */
307 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
308 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
309 +#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->utime
311 /* These items are per-entry optional and mutally exclusive: */
312 #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
315 @@ -328,8 +328,9 @@ to the detailed description below for a
316 --devices preserve device files (super-user only)
317 --specials preserve special files
318 -D same as --devices --specials
319 - -t, --times preserve times
320 - -O, --omit-dir-times omit directories when preserving times
321 + -t, --times preserve modify times
322 + -O, --omit-dir-times omit directories when preserving mod-times
323 + -U, --atimes preserve access (use) times
324 --super receiver attempts super-user activities
325 -S, --sparse handle sparse files efficiently
326 -n, --dry-run show what would have been transferred
327 @@ -870,6 +871,12 @@ it is preserving modification times (see
328 the directories on the receiving side, it is a good idea to use bf(-O).
329 This option is inferred if you use bf(--backup) without bf(--backup-dir).
331 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
332 +destination files to the same value as the source files. Note that the
333 +reading of the source file may update the atime of the source files, so
334 +repeated rsync runs with --atimes may be needed if you want to force the
335 +access-time values to be 100% identical on the two systems.
337 dit(bf(--super)) This tells the receiving side to attempt super-user
338 activities even if the receiving rsync wasn't run by the super-user. These
339 activities include: preserving users via the bf(--owner) option, preserving
340 @@ -1403,7 +1410,7 @@ with older versions of rsync, but that a
343 The "%i" escape has a cryptic output that is 9 letters long. The general
344 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
345 +format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
346 type of update being done, bf(X) is replaced by the file-type, and the
347 other letters represent attributes that may be output if they are being
349 @@ -1443,7 +1450,7 @@ quote(itemization(
350 by the file transfer.
351 it() A bf(t) means the modification time is different and is being updated
352 to the sender's value (requires bf(--times)). An alternate value of bf(T)
353 - means that the time will be set to the transfer time, which happens
354 + means that the modify time will be set to the transfer time, which happens
355 anytime a symlink is transferred, or when a file or device is transferred
357 it() A bf(p) means the permissions are different and are being updated to
358 @@ -1452,7 +1459,10 @@ quote(itemization(
359 sender's value (requires bf(--owner) and super-user privileges).
360 it() A bf(g) means the group is different and is being updated to the
361 sender's value (requires bf(--group) and the authority to set the group).
362 - it() The bf(z) slot is reserved for future use.
363 + it() A bf(u) means the access (use) time is different and is being updated to
364 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
365 + means that the access time will be set to the transfer time, which happens
366 + when a symlink or directory is updated.
369 One other output is possible: when deleting files, the "%i" will output
372 @@ -41,6 +41,7 @@ extern int do_progress;
375 extern int write_batch;
376 +extern unsigned int file_struct_len;
377 extern struct stats stats;
378 extern struct file_list *the_file_list;
379 extern char *stdout_format;
380 --- old/testsuite/atimes.test
381 +++ new/testsuite/atimes.test
385 +# Test rsync copying atimes
387 +. "$suitedir/rsync.fns"
393 +touch "$fromdir/foo"
394 +touch -a -t 200102031717.42 "$fromdir/foo"
398 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
400 +# The script would have aborted on error, so getting here means we've won.
402 --- old/testsuite/rsync.fns
403 +++ new/testsuite/rsync.fns
404 @@ -66,7 +66,7 @@ printmsg() {
408 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
409 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
413 @@ -184,6 +184,10 @@ checkit() {
414 # We can just write everything to stdout/stderr, because the
415 # wrapper hides it unless there is a problem.
417 + if test x$TLS_ARGS = x--atime; then
418 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
421 echo "Running: \"$1\""
424 @@ -191,10 +195,13 @@ checkit() {
428 + if test x$TLS_ARGS != x--atime; then
429 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
433 echo "check how the directory listings compare with diff:"
435 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
436 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
437 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
447 #define PROGRAM "tls"
449 @@ -43,6 +44,8 @@ int read_only = 1;
451 int preserve_perms = 0;
453 +static int display_atime = 0;
455 static void failed(char const *what, char const *where)
457 fprintf(stderr, PROGRAM ": %s %s: %s\n",
458 @@ -50,12 +53,29 @@ static void failed(char const *what, cha
462 +static void storetime(char *dest, time_t t, size_t destsize)
465 + struct tm *mt = gmtime(&t);
467 + snprintf(dest, destsize,
468 + "%04d-%02d-%02d %02d:%02d:%02d ",
469 + (int)mt->tm_year + 1900,
470 + (int)mt->tm_mon + 1,
476 + strlcpy(dest, " ", destsize);
479 static void list_file(const char *fname)
482 char permbuf[PERMSTRING_SIZE];
489 if (do_lstat(fname, &buf) < 0)
490 @@ -88,19 +108,8 @@ static void list_file(const char *fname)
492 permstring(permbuf, buf.st_mode);
494 - if (buf.st_mtime) {
495 - mt = gmtime(&buf.st_mtime);
497 - snprintf(datebuf, sizeof datebuf,
498 - "%04d-%02d-%02d %02d:%02d:%02d",
499 - (int)mt->tm_year + 1900,
500 - (int)mt->tm_mon + 1,
506 - strlcpy(datebuf, " ", sizeof datebuf);
507 + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
508 + storetime(atimebuf, buf.st_atime, sizeof atimebuf);
510 /* TODO: Perhaps escape special characters in fname? */
512 @@ -111,23 +120,55 @@ static void list_file(const char *fname)
513 (long)minor(buf.st_rdev));
514 } else /* NB: use double for size since it might not fit in a long. */
515 printf("%12.0f", (double)buf.st_size);
516 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
517 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
518 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
519 - datebuf, fname, linkbuf);
520 + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
524 +static struct poptOption long_options[] = {
525 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
526 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
527 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
531 +static void tls_usage(int ret)
533 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
534 + "Trivial file listing program for portably checking rsync\n");
539 main(int argc, char *argv[])
542 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
543 - "Trivial file listing program for portably checking rsync\n");
547 + const char **extra_args;
550 - for (argv++; *argv; argv++) {
552 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
554 + while ((opt = poptGetNextOpt(pc)) != -1) {
561 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
562 + poptStrerror(opt));
567 + extra_args = poptGetArgs(pc);
568 + if (*extra_args == NULL)
571 + for (; *extra_args; extra_args++)
572 + list_file(*extra_args);
573 + poptFreeContext(pc);
579 @@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char *
580 exit_cleanup(RERR_MALLOC);
583 -int set_modtime(const char *fname, time_t modtime, mode_t mode)
584 +int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
586 #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
588 @@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_
592 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
593 + char mtimebuf[200];
595 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
597 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
598 fname, (long)modtime,
599 - asctime(localtime(&modtime)));
600 + mtimebuf, (long)atime, timestring(atime));
604 @@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_
608 - t[0].tv_sec = time(NULL);
609 + t[0].tv_sec = atime;
611 t[1].tv_sec = modtime;
613 @@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_
614 return utimes(fname, t);
615 #elif defined HAVE_UTIMBUF
617 - tbuf.actime = time(NULL);
618 + tbuf.actime = atime;
619 tbuf.modtime = modtime;
620 return utime(fname,&tbuf);
621 #elif defined HAVE_UTIME
626 return utime(fname,t);