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 @@ -50,6 +50,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 @@ -47,6 +47,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 @@ -137,6 +138,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 @@ -149,14 +151,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 @@ -313,6 +317,7 @@ void flist_expand(struct file_list *flis
58 static void send_file_entry(struct file_struct *file, int f, int ndx)
60 static time_t modtime;
61 + static time_t atime;
65 @@ -367,6 +372,13 @@ static void send_file_entry(struct file_
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 @@ -434,6 +446,8 @@ static void send_file_entry(struct file_
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)) {
88 @@ -501,7 +515,7 @@ static void send_file_entry(struct file_
89 static struct file_struct *recv_file_entry(struct file_list *flist,
92 - static time_t modtime;
93 + static time_t modtime, atime;
97 @@ -522,7 +536,7 @@ static struct file_struct *recv_file_ent
98 struct file_struct *file;
101 - modtime = 0, mode = 0;
102 + modtime = 0, atime = 0, mode = 0;
103 dev = 0, rdev = MAKEDEV(0, 0);
106 @@ -610,6 +624,8 @@ static struct file_struct *recv_file_ent
107 modtime = (time_t)read_int(f);
108 if (!(flags & XMIT_SAME_MODE))
109 mode = from_wire_mode(read_int(f));
110 + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
111 + atime = (time_t)read_int(f);
113 if (chmod_modes && !S_ISLNK(mode))
114 mode = tweak_mode(mode, chmod_modes);
115 @@ -700,6 +716,8 @@ static struct file_struct *recv_file_ent
119 + if (preserve_atimes)
120 + F_ATIME(file) = atime;
123 file->dirname = lastdir = bp;
124 @@ -1002,6 +1020,8 @@ struct file_struct *make_file(const char
125 F_UID(file) = st.st_uid;
127 F_GID(file) = st.st_gid;
128 + if (preserve_atimes)
129 + F_ATIME(file) = st.st_atime;
132 file->dirname = lastdir = bp;
135 @@ -43,6 +43,7 @@ extern int preserve_perms;
136 extern int preserve_uid;
137 extern int preserve_gid;
138 extern int preserve_times;
139 +extern int preserve_atimes;
140 extern int omit_dir_times;
141 extern int delete_mode;
142 extern int delete_before;
143 @@ -547,6 +548,9 @@ void itemize(struct file_struct *file, i
144 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
145 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
146 iflags |= ITEM_REPORT_TIME;
147 + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
148 + && cmp_time(F_ATIME(file), st->st_atime) != 0)
149 + iflags |= ITEM_REPORT_ATIME;
150 if (!BITS_EQUAL(st->st_mode, file->mode, CHMOD_BITS))
151 iflags |= ITEM_REPORT_PERMS;
152 if (preserve_uid && am_root && F_UID(file) != st->st_uid)
153 @@ -858,6 +862,8 @@ static int try_dests_reg(struct file_str
155 if (!hard_link_one(file, fname, cmpbuf, 1))
157 + if (preserve_atimes)
158 + set_file_attrs(fname, file, stp, 0);
159 if (preserve_hard_links && F_IS_HLINKED(file))
160 finish_hard_link(file, fname, stp, itemizing, code, j);
161 if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
164 @@ -37,6 +37,7 @@ extern int msg_fd_out;
165 extern int allow_8bit_chars;
166 extern int protocol_version;
167 extern int preserve_times;
168 +extern int preserve_atimes;
169 extern int preserve_uid;
170 extern int preserve_gid;
171 extern int stdout_format_has_i;
172 @@ -625,7 +626,8 @@ static void log_formatted(enum logcode c
173 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
174 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
175 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
177 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
178 + : S_ISLNK(file->mode) ? 'U' : 'u';
181 if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
184 @@ -55,6 +55,7 @@ int preserve_uid = 0;
185 int preserve_gid = 0;
186 int preserve_times = 0;
187 int omit_dir_times = 0;
188 +int preserve_atimes = 0;
192 @@ -306,8 +307,9 @@ void usage(enum logcode F)
193 rprintf(F," --devices preserve device files (super-user only)\n");
194 rprintf(F," --specials preserve special files\n");
195 rprintf(F," -D same as --devices --specials\n");
196 - rprintf(F," -t, --times preserve times\n");
197 - rprintf(F," -O, --omit-dir-times omit directories when preserving times\n");
198 + rprintf(F," -t, --times preserve modify times\n");
199 + rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n");
200 + rprintf(F," -U, --atimes preserve access (use) times\n");
201 rprintf(F," --super receiver attempts super-user activities\n");
202 rprintf(F," -S, --sparse handle sparse files efficiently\n");
203 rprintf(F," -n, --dry-run show what would have been transferred\n");
204 @@ -424,6 +426,9 @@ static struct poptOption long_options[]
205 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
206 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
207 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
208 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
209 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
210 + {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
211 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 0, 0 },
212 {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
213 {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 },
214 @@ -1536,6 +1541,8 @@ void server_options(char **args,int *arg
218 + if (preserve_atimes)
222 else if (preserve_executability && am_sender)
225 @@ -34,6 +34,7 @@ extern int verbose;
227 extern int preserve_perms;
228 extern int preserve_executability;
229 +extern int preserve_atimes;
230 extern int preserve_times;
231 extern int omit_dir_times;
233 @@ -182,6 +183,7 @@ int set_file_attrs(char *fname, struct f
236 int change_uid, change_gid;
237 + time_t atime, mtime;
238 mode_t new_mode = file->mode;
241 @@ -201,18 +203,36 @@ int set_file_attrs(char *fname, struct f
245 + /* This code must be the first update in the function due to
246 + * how it uses the "updated" variable. */
247 if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
248 flags |= ATTRS_SKIP_MTIME;
249 + if (!preserve_atimes || S_ISDIR(st->st_mode))
250 + flags |= ATTRS_SKIP_ATIME;
251 if (!(flags & ATTRS_SKIP_MTIME)
252 && cmp_time(st->st_mtime, file->modtime) != 0) {
253 - int ret = set_modtime(fname, file->modtime, st->st_mode);
254 + mtime = file->modtime;
257 + mtime = st->st_mtime;
258 + if (!(flags & ATTRS_SKIP_ATIME)) {
259 + time_t file_atime = F_ATIME(file);
260 + if (cmp_time(st->st_atime, file_atime) != 0) {
261 + atime = file_atime;
264 + atime = st->st_atime;
266 + atime = st->st_atime;
268 + int ret = set_times(fname, mtime, atime, st->st_mode);
270 rsyserr(FERROR, errno, "failed to set times on %s",
274 - if (ret == 0) /* ret == 1 if symlink could not be set */
276 + if (ret > 0) /* ret == 1 if symlink could not be set */
280 change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
284 #define XMIT_SAME_DEV_pre30 (1<<10) /* protocols < 30 */
285 #define XMIT_HLINK_FIRST (1<<10) /* protocols >= 30 */
286 #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
287 +#define XMIT_SAME_ATIME (1<<12)
289 /* These flags are used in the live flist data. */
293 #define ATTRS_REPORT (1<<0)
294 #define ATTRS_SKIP_MTIME (1<<1)
295 +#define ATTRS_SKIP_ATIME (1<<2)
298 #define NORMAL_FLUSH 0
299 @@ -551,6 +553,7 @@ struct file_struct {
300 extern int file_extra_cnt;
301 extern int preserve_uid;
302 extern int preserve_gid;
303 +extern int preserve_atimes;
305 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
306 #define EXTRA_LEN (sizeof (union file_extras))
307 @@ -583,6 +586,7 @@ extern int preserve_gid;
308 /* When the associated option is on, all entries will have these present: */
309 #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
310 #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
311 +#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
313 /* These items are per-entry optional and mutally exclusive: */
314 #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
317 @@ -328,8 +328,9 @@ to the detailed description below for a
318 --devices preserve device files (super-user only)
319 --specials preserve special files
320 -D same as --devices --specials
321 - -t, --times preserve times
322 - -O, --omit-dir-times omit directories when preserving times
323 + -t, --times preserve modify times
324 + -O, --omit-dir-times omit directories when preserving mod-times
325 + -U, --atimes preserve access (use) times
326 --super receiver attempts super-user activities
327 -S, --sparse handle sparse files efficiently
328 -n, --dry-run show what would have been transferred
329 @@ -870,6 +871,12 @@ it is preserving modification times (see
330 the directories on the receiving side, it is a good idea to use bf(-O).
331 This option is inferred if you use bf(--backup) without bf(--backup-dir).
333 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
334 +destination files to the same value as the source files. Note that the
335 +reading of the source file may update the atime of the source files, so
336 +repeated rsync runs with --atimes may be needed if you want to force the
337 +access-time values to be 100% identical on the two systems.
339 dit(bf(--super)) This tells the receiving side to attempt super-user
340 activities even if the receiving rsync wasn't run by the super-user. These
341 activities include: preserving users via the bf(--owner) option, preserving
342 @@ -1403,7 +1410,7 @@ with older versions of rsync, but that a
345 The "%i" escape has a cryptic output that is 9 letters long. The general
346 -format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
347 +format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
348 type of update being done, bf(X) is replaced by the file-type, and the
349 other letters represent attributes that may be output if they are being
351 @@ -1443,7 +1450,7 @@ quote(itemization(
352 by the file transfer.
353 it() A bf(t) means the modification time is different and is being updated
354 to the sender's value (requires bf(--times)). An alternate value of bf(T)
355 - means that the time will be set to the transfer time, which happens
356 + means that the modify time will be set to the transfer time, which happens
357 anytime a symlink is transferred, or when a file or device is transferred
359 it() A bf(p) means the permissions are different and are being updated to
360 @@ -1452,7 +1459,10 @@ quote(itemization(
361 sender's value (requires bf(--owner) and super-user privileges).
362 it() A bf(g) means the group is different and is being updated to the
363 sender's value (requires bf(--group) and the authority to set the group).
364 - it() The bf(z) slot is reserved for future use.
365 + it() A bf(u) means the access (use) time is different and is being updated to
366 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
367 + means that the access time will be set to the transfer time, which happens
368 + when a symlink or directory is updated.
371 One other output is possible: when deleting files, the "%i" will output
374 @@ -41,6 +41,7 @@ extern int do_progress;
377 extern int write_batch;
378 +extern unsigned int file_struct_len;
379 extern struct stats stats;
380 extern struct file_list *the_file_list;
381 extern char *stdout_format;
382 --- old/testsuite/atimes.test
383 +++ new/testsuite/atimes.test
387 +# Test rsync copying atimes
389 +. "$suitedir/rsync.fns"
395 +touch "$fromdir/foo"
396 +touch -a -t 200102031717.42 "$fromdir/foo"
400 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
402 +# The script would have aborted on error, so getting here means we've won.
404 --- old/testsuite/rsync.fns
405 +++ new/testsuite/rsync.fns
406 @@ -66,7 +66,7 @@ printmsg() {
410 - find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
411 + find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
415 @@ -184,6 +184,10 @@ checkit() {
416 # We can just write everything to stdout/stderr, because the
417 # wrapper hides it unless there is a problem.
419 + if test x$TLS_ARGS = x--atime; then
420 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
423 echo "Running: \"$1\""
426 @@ -191,10 +195,13 @@ checkit() {
430 + if test x$TLS_ARGS != x--atime; then
431 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
435 echo "check how the directory listings compare with diff:"
437 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
438 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
439 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
449 #define PROGRAM "tls"
451 @@ -43,6 +44,8 @@ int read_only = 1;
453 int preserve_perms = 0;
455 +static int display_atime = 0;
457 static void failed(char const *what, char const *where)
459 fprintf(stderr, PROGRAM ": %s %s: %s\n",
460 @@ -50,12 +53,29 @@ static void failed(char const *what, cha
464 +static void storetime(char *dest, time_t t, size_t destsize)
467 + struct tm *mt = gmtime(&t);
469 + snprintf(dest, destsize,
470 + "%04d-%02d-%02d %02d:%02d:%02d ",
471 + (int)mt->tm_year + 1900,
472 + (int)mt->tm_mon + 1,
478 + strlcpy(dest, " ", destsize);
481 static void list_file(const char *fname)
484 char permbuf[PERMSTRING_SIZE];
491 if (do_lstat(fname, &buf) < 0)
492 @@ -88,19 +108,8 @@ static void list_file(const char *fname)
494 permstring(permbuf, buf.st_mode);
496 - if (buf.st_mtime) {
497 - mt = gmtime(&buf.st_mtime);
499 - snprintf(datebuf, sizeof datebuf,
500 - "%04d-%02d-%02d %02d:%02d:%02d",
501 - (int)mt->tm_year + 1900,
502 - (int)mt->tm_mon + 1,
508 - strlcpy(datebuf, " ", sizeof datebuf);
509 + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
510 + storetime(atimebuf, buf.st_atime, sizeof atimebuf);
512 /* TODO: Perhaps escape special characters in fname? */
514 @@ -111,23 +120,55 @@ static void list_file(const char *fname)
515 (long)minor(buf.st_rdev));
516 } else /* NB: use double for size since it might not fit in a long. */
517 printf("%12.0f", (double)buf.st_size);
518 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
519 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
520 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
521 - datebuf, fname, linkbuf);
522 + mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
526 +static struct poptOption long_options[] = {
527 + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
528 + {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
529 + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
533 +static void tls_usage(int ret)
535 + fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
536 + "Trivial file listing program for portably checking rsync\n");
541 main(int argc, char *argv[])
544 - fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
545 - "Trivial file listing program for portably checking rsync\n");
549 + const char **extra_args;
552 - for (argv++; *argv; argv++) {
554 + pc = poptGetContext(PROGRAM, argc, (const char **)argv,
556 + while ((opt = poptGetNextOpt(pc)) != -1) {
563 + poptBadOption(pc, POPT_BADOPTION_NOALIAS),
564 + poptStrerror(opt));
569 + extra_args = poptGetArgs(pc);
570 + if (*extra_args == NULL)
573 + for (; *extra_args; extra_args++)
574 + list_file(*extra_args);
575 + poptFreeContext(pc);
581 @@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char *
582 exit_cleanup(RERR_MALLOC);
585 -int set_modtime(const char *fname, time_t modtime, mode_t mode)
586 +int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
588 #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
590 @@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_
594 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
595 + char mtimebuf[200];
597 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
599 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
600 fname, (long)modtime,
601 - asctime(localtime(&modtime)));
602 + mtimebuf, (long)atime, timestring(atime));
606 @@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_
610 - t[0].tv_sec = time(NULL);
611 + t[0].tv_sec = atime;
613 t[1].tv_sec = modtime;
615 @@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_
616 return utimes(fname, t);
617 #elif defined HAVE_UTIMBUF
619 - tbuf.actime = time(NULL);
620 + tbuf.actime = atime;
621 tbuf.modtime = modtime;
622 return utime(fname,&tbuf);
623 #elif defined HAVE_UTIME
628 return utime(fname,t);