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 @@ -329,7 +334,7 @@ static void send_file_entry(struct file_
58 - modtime = 0, mode = 0;
59 + modtime = 0, atime = 0, mode = 0;
60 dev = 0, rdev = MAKEDEV(0, 0);
63 @@ -379,6 +384,13 @@ static void send_file_entry(struct file_
64 flags |= XMIT_SAME_TIME;
66 modtime = file->modtime;
67 + if (preserve_atimes && !S_ISDIR(mode)) {
68 + time_t file_atime = F_ATIME(file);
69 + if (file_atime == atime)
70 + flags |= XMIT_SAME_ATIME;
75 #ifdef SUPPORT_HARD_LINKS
76 if (tmp_idev.dev != 0) {
77 @@ -431,6 +443,8 @@ static void send_file_entry(struct file_
78 write_int(f, modtime);
79 if (!(flags & XMIT_SAME_MODE))
80 write_int(f, to_wire_mode(mode));
81 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
82 + write_int(f, atime);
83 if (preserve_uid && !(flags & XMIT_SAME_UID)) {
86 @@ -497,7 +511,7 @@ static void send_file_entry(struct file_
87 static struct file_struct *recv_file_entry(struct file_list *flist,
88 unsigned short flags, int f)
90 - static time_t modtime;
91 + static time_t modtime, atime;
95 @@ -517,7 +531,7 @@ static struct file_struct *recv_file_ent
96 struct file_struct *file;
99 - modtime = 0, mode = 0;
100 + modtime = 0, atime = 0, mode = 0;
101 dev = 0, rdev = MAKEDEV(0, 0);
104 @@ -573,6 +587,8 @@ static struct file_struct *recv_file_ent
105 modtime = (time_t)read_int(f);
106 if (!(flags & XMIT_SAME_MODE))
107 mode = from_wire_mode(read_int(f));
108 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
109 + atime = (time_t)read_int(f);
111 if (chmod_modes && !S_ISLNK(mode))
112 mode = tweak_mode(mode, chmod_modes);
113 @@ -657,6 +673,8 @@ static struct file_struct *recv_file_ent
117 + if (preserve_atimes)
118 + F_ATIME(file) = atime;
121 file->dirname = lastdir = bp;
122 @@ -934,6 +952,8 @@ struct file_struct *make_file(const char
123 F_UID(file) = st.st_uid;
125 F_GID(file) = st.st_gid;
126 + if (preserve_atimes)
127 + F_ATIME(file) = st.st_atime;
130 file->dirname = lastdir = bp;
133 @@ -43,6 +43,7 @@ extern int preserve_perms;
134 extern int preserve_uid;
135 extern int preserve_gid;
136 extern int preserve_times;
137 +extern int preserve_atimes;
138 extern int omit_dir_times;
139 extern int delete_mode;
140 extern int delete_before;
141 @@ -548,6 +549,9 @@ void itemize(struct file_struct *file, i
142 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
143 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
144 iflags |= ITEM_REPORT_TIME;
145 + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
146 + && cmp_time(F_ATIME(file), st->st_atime) != 0)
147 + iflags |= ITEM_REPORT_ATIME;
148 if ((unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
149 iflags |= ITEM_REPORT_PERMS;
150 if (preserve_uid && am_root && F_UID(file) != st->st_uid)
151 @@ -859,6 +863,8 @@ static int try_dests_reg(struct file_str
153 if (!hard_link_one(file, fname, cmpbuf, 1))
155 + if (preserve_atimes)
156 + set_file_attrs(fname, file, stp, 0);
157 if (preserve_hard_links && F_IS_HLINKED(file))
158 finish_hard_link(file, fname, stp, itemizing, code, j);
159 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
162 @@ -37,6 +37,7 @@ extern int msg_fd_out;
163 extern int allow_8bit_chars;
164 extern int protocol_version;
165 extern int preserve_times;
166 +extern int preserve_atimes;
167 extern int preserve_uid;
168 extern int preserve_gid;
169 extern int stdout_format_has_i;
170 @@ -625,7 +626,8 @@ static void log_formatted(enum logcode c
171 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
172 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
173 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
175 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
176 + : S_ISLNK(file->mode) ? 'U' : 'u';
179 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
182 @@ -55,6 +55,7 @@ int preserve_uid = 0;
183 int preserve_gid = 0;
184 int preserve_times = 0;
185 int omit_dir_times = 0;
186 +int preserve_atimes = 0;
190 @@ -307,8 +308,9 @@ void usage(enum logcode F)
191 rprintf(F," --devices preserve device files (super-user only)\n");
192 rprintf(F," --specials preserve special files\n");
193 rprintf(F," -D same as --devices --specials\n");
194 - rprintf(F," -t, --times preserve times\n");
195 - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
196 + rprintf(F," -t, --times preserve modify times\n");
197 + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
198 + rprintf(F," -U, --atimes preserve access (use) times\n");
199 rprintf(F," --super receiver attempts super-user activities\n");
200 rprintf(F," -S, --sparse handle sparse files efficiently\n");
201 rprintf(F," -n, --dry-run show what would have been transferred\n");
202 @@ -425,6 +427,9 @@ static struct poptOption long_options[]
203 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
204 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
205 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
206 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
207 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
208 + {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
209 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
210 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
211 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
212 @@ -1223,6 +1228,8 @@ int parse_arguments(int *argc, const cha
213 preserve_uid = ++flist_extra_cnt;
215 preserve_gid = ++flist_extra_cnt;
216 + if (preserve_atimes)
217 + preserve_atimes = ++flist_extra_cnt;
219 *argv = poptGetArgs(pc);
220 *argc = count_args(*argv);
221 @@ -1542,6 +1549,8 @@ void server_options(char **args,int *arg
225 + if (preserve_atimes)
229 else if (preserve_executability && am_sender)
232 @@ -34,6 +34,7 @@ extern int verbose;
234 extern int preserve_perms;
235 extern int preserve_executability;
236 +extern int preserve_atimes;
237 extern int preserve_times;
238 extern int omit_dir_times;
240 @@ -182,6 +183,7 @@ int set_file_attrs(char *fname, struct f
243 int change_uid, change_gid;
244 + time_t atime, mtime;
245 mode_t new_mode = file->mode;
248 @@ -201,18 +203,36 @@ int set_file_attrs(char *fname, struct f
252 + /* This code must be the first update in the function due to
253 + * how it uses the "updated" variable. */
254 if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
255 flags |= ATTRS_SKIP_MTIME;
256 + if (!preserve_atimes || S_ISDIR(st->st_mode))
257 + flags |= ATTRS_SKIP_ATIME;
258 if (!(flags & ATTRS_SKIP_MTIME)
259 && cmp_time(st->st_mtime, file->modtime) != 0) {
260 - int ret = set_modtime(fname, file->modtime, st->st_mode);
261 + mtime = file->modtime;
264 + mtime = st->st_mtime;
265 + if (!(flags & ATTRS_SKIP_ATIME)) {
266 + time_t file_atime = F_ATIME(file);
267 + if (cmp_time(st->st_atime, file_atime) != 0) {
268 + atime = file_atime;
271 + atime = st->st_atime;
273 + atime = st->st_atime;
275 + int ret = set_times(fname, mtime, atime, st->st_mode);
277 rsyserr(FERROR, errno, "failed to set times on %s",
281 - if (ret == 0) /* ret == 1 if symlink could not be set */
283 + if (ret > 0) /* ret == 1 if symlink could not be set */
287 change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
291 #define XMIT_HAS_IDEV_DATA (1<<9)
292 #define XMIT_SAME_DEV (1<<10)
293 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
294 +#define XMIT_SAME_ATIME (1<<12)
296 /* These flags are used in the live flist data. */
300 #define ATTRS_REPORT (1<<0)
301 #define ATTRS_SKIP_MTIME (1<<1)
302 +#define ATTRS_SKIP_ATIME (1<<2)
305 #define NORMAL_FLUSH 0
306 @@ -506,6 +508,7 @@ struct file_struct {
308 uid_t uid; /* The user ID number */
309 uid_t gid; /* The group ID number or GID_NONE */
310 + time_t utime; /* A unix-time value */
311 struct idev *idev; /* The hard-link info during matching */
312 struct hlist *hlist; /* The hard-link info after matching */
313 int32 num; /* A signed number */
314 @@ -548,6 +551,7 @@ extern int preserve_gid;
315 /* When the associated option is on, all entries will have these present: */
316 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
317 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
318 +#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->utime
320 /* These items are per-entry optional and mutally exclusive: */
321 #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
324 @@ -328,8 +328,9 @@ to the detailed description below for a
325 --devices preserve device files (super-user only)
326 --specials preserve special files
327 -D same as --devices --specials
328 - -t, --times preserve times
329 - -O, --omit-dir-times omit directories when preserving times
330 + -t, --times preserve modify times
331 + -O, --omit-dir-times omit directories when preserving mod-times
332 + -U, --atimes preserve access (use) times
333 --super receiver attempts super-user activities
334 -S, --sparse handle sparse files efficiently
335 -n, --dry-run show what would have been transferred
336 @@ -870,6 +871,12 @@ it is preserving modification times (see
337 the directories on the receiving side, it is a good idea to use bf(-O).
338 This option is inferred if you use bf(--backup) without bf(--backup-dir).
340 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
341 +destination files to the same value as the source files. Note that the
342 +reading of the source file may update the atime of the source files, so
343 +repeated rsync runs with --atimes may be needed if you want to force the
344 +access-time values to be 100% identical on the two systems.
346 dit(bf(--super)) This tells the receiving side to attempt super-user
347 activities even if the receiving rsync wasn't run by the super-user. These
348 activities include: preserving users via the bf(--owner) option, preserving
349 @@ -1403,7 +1410,7 @@ with older versions of rsync, but that a
352 The "%i" escape has a cryptic output that is 9 letters long. The general
353 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
354 +format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
355 type of update being done, bf(X) is replaced by the file-type, and the
356 other letters represent attributes that may be output if they are being
358 @@ -1443,7 +1450,7 @@ quote(itemization(
359 by the file transfer.
360 it() A bf(t) means the modification time is different and is being updated
361 to the sender's value (requires bf(--times)). An alternate value of bf(T)
362 - means that the time will be set to the transfer time, which happens
363 + means that the modify time will be set to the transfer time, which happens
364 anytime a symlink is transferred, or when a file or device is transferred
366 it() A bf(p) means the permissions are different and are being updated to
367 @@ -1452,7 +1459,10 @@ quote(itemization(
368 sender's value (requires bf(--owner) and super-user privileges).
369 it() A bf(g) means the group is different and is being updated to the
370 sender's value (requires bf(--group) and the authority to set the group).
371 - it() The bf(z) slot is reserved for future use.
372 + it() A bf(u) means the access (use) time is different and is being updated to
373 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
374 + means that the access time will be set to the transfer time, which happens
375 + when a symlink or directory is updated.
378 One other output is possible: when deleting files, the "%i" will output
381 @@ -41,6 +41,7 @@ extern int do_progress;
384 extern int write_batch;
385 +extern unsigned int file_struct_len;
386 extern struct stats stats;
387 extern struct file_list *the_file_list;
388 extern char *stdout_format;
389 --- old/testsuite/atimes.test
390 +++ new/testsuite/atimes.test
394 +# Test rsync copying atimes
396 +. "$suitedir/rsync.fns"
402 +touch "$fromdir/foo"
403 +touch -a -t 200102031717.42 "$fromdir/foo"
407 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
409 +# The script would have aborted on error, so getting here means we've won.
411 --- old/testsuite/rsync.fns
412 +++ new/testsuite/rsync.fns
413 @@ -66,7 +66,7 @@ printmsg() {
417 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
418 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
422 @@ -184,6 +184,10 @@ checkit() {
423 # We can just write everything to stdout/stderr, because the
424 # wrapper hides it unless there is a problem.
426 + if test x$TLS_ARGS = x--atime; then
427 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
430 echo "Running: \"$1\""
433 @@ -191,10 +195,13 @@ checkit() {
437 + if test x$TLS_ARGS != x--atime; then
438 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
442 echo "check how the directory listings compare with diff:"
444 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
445 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
446 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
456 #define PROGRAM "tls"
458 @@ -43,6 +44,8 @@ int read_only = 1;
460 int preserve_perms = 0;
462 +static int display_atime = 0;
464 static void failed(char const *what, char const *where)
466 fprintf(stderr, PROGRAM ": %s %s: %s\n",
467 @@ -50,12 +53,29 @@ static void failed(char const *what, cha
471 +static void storetime(char *dest, time_t t, size_t destsize)
474 + struct tm *mt = gmtime(&t);
476 + snprintf(dest, destsize,
477 + "%04d-%02d-%02d %02d:%02d:%02d ",
478 + (int)mt->tm_year + 1900,
479 + (int)mt->tm_mon + 1,
485 + strlcpy(dest, " ", destsize);
488 static void list_file(const char *fname)
491 char permbuf[PERMSTRING_SIZE];
498 if (do_lstat(fname, &buf) < 0)
499 @@ -88,19 +108,8 @@ static void list_file(const char *fname)
501 permstring(permbuf, buf.st_mode);
503 - if (buf.st_mtime) {
504 - mt = gmtime(&buf.st_mtime);
506 - snprintf(datebuf, sizeof datebuf,
507 - "%04d-%02d-%02d %02d:%02d:%02d",
508 - (int)mt->tm_year + 1900,
509 - (int)mt->tm_mon + 1,
515 - strlcpy(datebuf, " ", sizeof datebuf);
516 + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
517 + storetime(atimebuf, buf.st_atime, sizeof atimebuf);
519 /* TODO: Perhaps escape special characters in fname? */
521 @@ -111,23 +120,55 @@ static void list_file(const char *fname)
522 (long)minor(buf.st_rdev));
523 } else /* NB: use double for size since it might not fit in a long. */
524 printf("%12.0f", (double)buf.st_size);
525 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
526 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
527 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
528 - datebuf, fname, linkbuf);
529 + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
533 +static struct poptOption long_options[] = {
534 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
535 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
536 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
540 +static void tls_usage(int ret)
542 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
543 + "Trivial file listing program for portably checking rsync\n");
548 main(int argc, char *argv[])
551 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
552 - "Trivial file listing program for portably checking rsync\n");
556 + const char **extra_args;
559 - for (argv++; *argv; argv++) {
561 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
563 + while ((opt = poptGetNextOpt(pc)) != -1) {
570 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
571 + poptStrerror(opt));
576 + extra_args = poptGetArgs(pc);
577 + if (*extra_args == NULL)
580 + for (; *extra_args; extra_args++)
581 + list_file(*extra_args);
582 + poptFreeContext(pc);
588 @@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char *
589 exit_cleanup(RERR_MALLOC);
592 -int set_modtime(const char *fname, time_t modtime, mode_t mode)
593 +int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
595 #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
597 @@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_
601 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
602 + char mtimebuf[200];
604 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
606 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
607 fname, (long)modtime,
608 - asctime(localtime(&modtime)));
609 + mtimebuf, (long)atime, timestring(atime));
613 @@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_
617 - t[0].tv_sec = time(NULL);
618 + t[0].tv_sec = atime;
620 t[1].tv_sec = modtime;
622 @@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_
623 return utimes(fname, t);
624 #elif defined HAVE_UTIMBUF
626 - tbuf.actime = time(NULL);
627 + tbuf.actime = atime;
628 tbuf.modtime = modtime;
629 return utime(fname,&tbuf);
630 #elif defined HAVE_UTIME
635 return utime(fname,t);