1 To use this patch, run these commands for a successful build:
3 patch -p1 <patches/atimes.diff
4 ./configure (optional if already run)
7 based-on: 7cb0de6326c915a72253fd103dae93308031ec3f
8 diff --git a/compat.c b/compat.c
11 @@ -47,6 +47,7 @@ extern int protocol_version;
12 extern int protect_args;
13 extern int preserve_uid;
14 extern int preserve_gid;
15 +extern int preserve_atimes;
16 extern int preserve_acls;
17 extern int preserve_xattrs;
18 extern int need_messages_from_generator;
19 @@ -64,7 +65,7 @@ extern char *iconv_opt;
22 /* These index values are for the file-list's extra-attribute array. */
23 -int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
24 +int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
26 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
27 int sender_symlink_iconv = 0; /* sender should convert symlink content */
28 @@ -142,6 +143,8 @@ void setup_protocol(int f_out,int f_in)
29 uid_ndx = ++file_extra_cnt;
31 gid_ndx = ++file_extra_cnt;
32 + if (preserve_atimes)
33 + atimes_ndx = (file_extra_cnt += TIME_EXTRA_CNT);
34 if (preserve_acls && !am_sender)
35 acls_ndx = ++file_extra_cnt;
37 diff --git a/flist.c b/flist.c
40 @@ -53,6 +53,7 @@ extern int preserve_specials;
41 extern int delete_during;
42 extern int missing_args;
44 +extern int atimes_ndx;
45 extern int relative_paths;
46 extern int implied_dirs;
47 extern int ignore_perishable;
48 @@ -397,7 +398,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
50 int ndx, int first_ndx)
52 - static time_t modtime;
53 + static time_t modtime, atime;
55 #ifdef SUPPORT_HARD_LINKS
57 @@ -497,6 +498,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
58 modtime = file->modtime;
59 if (NSEC_BUMP(file) && protocol_version >= 31)
60 xflags |= XMIT_MOD_NSEC;
61 + if (atimes_ndx && !S_ISDIR(mode)) {
62 + time_t file_atime = f_atime(file);
63 + if (file_atime == atime)
64 + xflags |= XMIT_SAME_ATIME;
69 #ifdef SUPPORT_HARD_LINKS
71 @@ -583,6 +591,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
72 write_varint(f, F_MOD_NSEC(file));
73 if (!(xflags & XMIT_SAME_MODE))
74 write_int(f, to_wire_mode(mode));
75 + if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
76 + write_varlong(f, atime, 4);
77 if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
78 if (protocol_version < 30)
80 @@ -670,7 +680,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
82 static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
84 - static int64 modtime;
85 + static int64 modtime, atime;
87 #ifdef SUPPORT_HARD_LINKS
89 @@ -817,6 +827,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
91 if (!(xflags & XMIT_SAME_MODE))
92 mode = from_wire_mode(read_int(f));
93 + if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
94 + atime = read_varlong(f, 4);
95 +#if SIZEOF_TIME_T < SIZEOF_INT64
96 + if (!am_generator && (int64)(time_t)atime != atime) {
97 + rprintf(FERROR_XFER,
98 + "Access time value of %s truncated on receiver.\n",
104 if (chmod_modes && !S_ISLNK(mode) && mode)
105 mode = tweak_mode(mode, chmod_modes);
106 @@ -984,6 +1004,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
108 file->flags |= gid_flags;
111 + f_atime_set(file, (time_t)atime);
113 F_NDX(file) = flist->used + flist->ndx_start;
115 @@ -1381,6 +1403,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
116 F_GROUP(file) = st.st_gid;
117 if (am_generator && st.st_uid == our_uid)
118 file->flags |= FLAG_OWNED_BY_US;
120 + f_atime_set(file, st.st_atime);
122 if (basename != thisname)
123 file->dirname = lastdir;
124 diff --git a/generator.c b/generator.c
127 @@ -500,6 +500,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
128 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
129 && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
130 iflags |= ITEM_REPORT_TIME;
131 + if (atimes_ndx && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
132 + && cmp_time(f_atime(file), sxp->st.st_atime) != 0)
133 + iflags |= ITEM_REPORT_ATIME;
134 #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
135 if (S_ISLNK(file->mode)) {
137 @@ -917,6 +920,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
139 if (!hard_link_one(file, fname, cmpbuf, 1))
142 + set_file_attrs(fname, file, sxp, NULL, 0);
143 if (preserve_hard_links && F_IS_HLINKED(file))
144 finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
145 if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
146 @@ -1119,6 +1124,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
147 static void list_file_entry(struct file_struct *f)
149 char permbuf[PERMSTRING_SIZE];
150 + time_t atime = atimes_ndx ? f_atime(f) : 0;
152 int colwidth = human_readable ? 14 : 11;
154 @@ -1134,10 +1140,12 @@ static void list_file_entry(struct file_struct *f)
157 if (preserve_links && S_ISLNK(f->mode)) {
158 - rprintf(FINFO, "%s %*s %s %s -> %s\n",
159 + rprintf(FINFO, "%s %*s %s%s%s %s -> %s\n",
160 permbuf, colwidth, human_num(len),
161 - timestring(f->modtime), f_name(f, NULL),
163 + timestring(f->modtime),
164 + atimes_ndx ? " " : "",
165 + atimes_ndx ? timestring(atime) : "",
166 + f_name(f, NULL), F_SYMLINK(f));
169 if (missing_args == 2 && f->mode == 0) {
170 @@ -1145,9 +1153,12 @@ static void list_file_entry(struct file_struct *f)
171 colwidth + 31, "*missing",
174 - rprintf(FINFO, "%s %*s %s %s\n",
175 + rprintf(FINFO, "%s %*s %s%s%s %s\n",
176 permbuf, colwidth, human_num(len),
177 - timestring(f->modtime), f_name(f, NULL));
178 + timestring(f->modtime),
179 + atimes_ndx ? " " : "",
180 + atimes_ndx ? timestring(atime) : "",
185 @@ -2050,7 +2061,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
187 if (link_stat(fname, &st, 0) == 0
188 && cmp_time(st.st_mtime, file->modtime) != 0)
189 - set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode);
190 + set_times(fname, file->modtime, F_MOD_NSEC(file), file->modtime, file->mode);
192 if (counter >= loopchk_limit) {
194 diff --git a/ifuncs.h b/ifuncs.h
197 @@ -43,6 +43,28 @@ free_xbuf(xbuf *xb)
198 memset(xb, 0, sizeof (xbuf));
201 +static inline time_t
202 +f_atime(struct file_struct *fp)
204 +#if SIZEOF_TIME_T > 4
206 + memcpy(&atime, &REQ_EXTRA(fp, atimes_ndx)->unum, SIZEOF_TIME_T);
209 + return REQ_EXTRA(fp, atimes_ndx)->unum;
214 +f_atime_set(struct file_struct *fp, time_t atime)
216 +#if SIZEOF_TIME_T > 4
217 + memcpy(&REQ_EXTRA(fp, atimes_ndx)->unum, &atime, SIZEOF_TIME_T);
219 + REQ_EXTRA(fp, atimes_ndx)->unum = (uint32)atime;
224 to_wire_mode(mode_t mode)
226 diff --git a/log.c b/log.c
229 @@ -720,7 +720,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
230 c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
231 c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
232 c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
233 - c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
234 + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
235 + : S_ISLNK(file->mode) ? 'U' : 'u';
236 c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
237 c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
239 diff --git a/options.c b/options.c
242 @@ -61,6 +61,7 @@ int preserve_specials = 0;
243 int preserve_uid = 0;
244 int preserve_gid = 0;
245 int preserve_times = 0;
246 +int preserve_atimes = 0;
250 @@ -709,6 +710,7 @@ void usage(enum logcode F)
251 rprintf(F," --specials preserve special files\n");
252 rprintf(F," -D same as --devices --specials\n");
253 rprintf(F," -t, --times preserve modification times\n");
254 + rprintf(F," -U, --atimes preserve access (last-used) times\n");
255 rprintf(F," -O, --omit-dir-times omit directories from --times\n");
256 rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
257 rprintf(F," --super receiver attempts super-user activities\n");
258 @@ -867,6 +869,9 @@ static struct poptOption long_options[] = {
259 {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
260 {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
261 {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
262 + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
263 + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
264 + {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
265 {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
266 {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
267 {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
268 @@ -2439,6 +2444,8 @@ void server_options(char **args, int *argc_p)
272 + if (preserve_atimes)
276 else if (preserve_executability && am_sender)
277 diff --git a/rsync.c b/rsync.c
280 @@ -458,6 +458,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
283 int change_uid, change_gid;
284 + time_t atime, mtime;
285 mode_t new_mode = file->mode;
288 @@ -543,22 +544,40 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
289 set_xattr(fname, file, fnamecmp, sxp);
292 + /* This code must be the first update in the function due to
293 + * how it uses the "updated" variable. */
295 || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
296 || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
297 flags |= ATTRS_SKIP_MTIME;
298 + if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
299 + flags |= ATTRS_SKIP_ATIME;
300 if (!(flags & ATTRS_SKIP_MTIME)
301 && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
302 - int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);
303 + mtime = file->modtime;
306 + mtime = sxp->st.st_mtime;
307 + if (!(flags & ATTRS_SKIP_ATIME)) {
308 + time_t file_atime = f_atime(file);
309 + if (cmp_time(sxp->st.st_atime, file_atime) != 0) {
310 + atime = file_atime;
313 + atime = sxp->st.st_atime;
315 + atime = sxp->st.st_atime;
317 + int ret = set_times(fname, mtime, F_MOD_NSEC(file), atime, sxp->st.st_mode);
319 rsyserr(FERROR_XFER, errno, "failed to set times on %s",
323 - if (ret == 0) /* ret == 1 if symlink could not be set */
326 + if (ret > 0) { /* ret == 1 if symlink could not be set */
328 file->flags |= FLAG_TIME_FAILED;
333 @@ -662,7 +681,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
335 /* Change permissions before putting the file into place. */
336 set_file_attrs(fnametmp, file, NULL, fnamecmp,
337 - ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
338 + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
340 /* move tmp file over real file */
341 if (DEBUG_GTE(RECV, 1))
342 @@ -687,7 +706,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
345 set_file_attrs(fnametmp, file, NULL, fnamecmp,
346 - ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
347 + ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
349 if (temp_copy_name) {
350 if (do_rename(fnametmp, fname) < 0) {
351 diff --git a/rsync.h b/rsync.h
355 #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */
356 #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
357 #define XMIT_MOD_NSEC (1<<13) /* protocols 31 - now */
358 +#define XMIT_SAME_ATIME (1<<14) /* protocols ?? - now */
360 /* These flags are used in the live flist data. */
364 #define ATTRS_REPORT (1<<0)
365 #define ATTRS_SKIP_MTIME (1<<1)
366 +#define ATTRS_SKIP_ATIME (1<<2)
369 #define NORMAL_FLUSH 0
370 @@ -709,12 +711,14 @@ extern int file_extra_cnt;
371 extern int inc_recurse;
374 +extern int atimes_ndx;
376 extern int xattrs_ndx;
378 #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
379 #define EXTRA_LEN (sizeof (union file_extras))
380 #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
381 +#define TIME_EXTRA_CNT ((SIZEOF_TIME_T + EXTRA_LEN - 1) / EXTRA_LEN)
382 #define DEV_EXTRA_CNT 2
383 #define DIRNODE_EXTRA_CNT 3
384 #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
385 diff --git a/rsync.yo b/rsync.yo
388 @@ -372,6 +372,7 @@ to the detailed description below for a complete description. verb(
389 --specials preserve special files
390 -D same as --devices --specials
391 -t, --times preserve modification times
392 + -U, --atimes preserve access (use) times
393 -O, --omit-dir-times omit directories from --times
394 -J, --omit-link-times omit symlinks from --times
395 --super receiver attempts super-user activities
396 @@ -1173,6 +1174,12 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
397 updated (though rsync's delta-transfer algorithm will make the update fairly efficient
398 if the files haven't actually changed, you're much better off using bf(-t)).
400 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
401 +destination files to the same value as the source files. Note that the
402 +reading of the source file may update the atime of the source files, so
403 +repeated rsync runs with --atimes may be needed if you want to force the
404 +access-time values to be 100% identical on the two systems.
406 dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
407 it is preserving modification times (see bf(--times)). If NFS is sharing
408 the directories on the receiving side, it is a good idea to use bf(-O).
409 @@ -2130,7 +2137,10 @@ quote(itemization(
410 sender's value (requires bf(--owner) and super-user privileges).
411 it() A bf(g) means the group is different and is being updated to the
412 sender's value (requires bf(--group) and the authority to set the group).
413 - it() The bf(u) slot is reserved for future use.
414 + it() A bf(u) means the access (use) time is different and is being updated to
415 + the sender's value (requires bf(--atimes)). An alternate value of bf(U)
416 + means that the access time will be set to the transfer time, which happens
417 + when a symlink or directory is updated.
418 it() The bf(a) means that the ACL information changed.
419 it() The bf(x) means that the extended attribute information changed.
421 diff --git a/syscall.c b/syscall.c
424 @@ -349,15 +349,15 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
427 #ifdef HAVE_UTIMENSAT
428 -int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
429 +int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
431 struct timespec t[2];
433 if (dry_run) return 0;
434 RETURN_ERROR_IF_RO_OR_LO;
437 - t[0].tv_nsec = UTIME_NOW;
438 + t[0].tv_sec = atime;
439 + t[0].tv_nsec = a_nsec;
440 t[1].tv_sec = modtime;
441 t[1].tv_nsec = mod_nsec;
442 return utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW);
443 @@ -365,15 +365,15 @@ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
447 -int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
448 +int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
452 if (dry_run) return 0;
453 RETURN_ERROR_IF_RO_OR_LO;
455 - t[0].tv_sec = time(NULL);
457 + t[0].tv_sec = atime;
458 + t[0].tv_usec = a_nsec;
459 t[1].tv_sec = modtime;
460 t[1].tv_usec = mod_nsec / 1000;
461 return lutimes(fname, t);
462 @@ -381,22 +381,22 @@ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
466 -int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec)
467 +int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
471 if (dry_run) return 0;
472 RETURN_ERROR_IF_RO_OR_LO;
474 - t[0].tv_sec = time(NULL);
476 + t[0].tv_sec = atime;
477 + t[0].tv_usec = a_nsec;
478 t[1].tv_sec = modtime;
479 t[1].tv_usec = mod_nsec / 1000;
480 return utimes(fname, t);
483 #elif defined HAVE_UTIME
484 -int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
485 +int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec), time_t atime, UNUSED(uint32 a_nsec))
487 #ifdef HAVE_STRUCT_UTIMBUF
489 @@ -408,11 +408,11 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
490 RETURN_ERROR_IF_RO_OR_LO;
492 # ifdef HAVE_STRUCT_UTIMBUF
493 - tbuf.actime = time(NULL);
494 + tbuf.actime = atime;
495 tbuf.modtime = modtime;
496 return utime(fname, &tbuf);
501 return utime(fname, t);
503 diff --git a/testsuite/atimes.test b/testsuite/atimes.test
506 +++ b/testsuite/atimes.test
510 +# Test rsync copying atimes
512 +. "$suitedir/rsync.fns"
516 +touch "$fromdir/foo"
517 +touch -a -t 200102031717.42 "$fromdir/foo"
521 +checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
523 +# The script would have aborted on error, so getting here means we've won.
525 diff --git a/testsuite/daemon.test b/testsuite/daemon.test
526 --- a/testsuite/daemon.test
527 +++ b/testsuite/daemon.test
528 @@ -27,7 +27,7 @@ outfile="$scratchdir/rsync.out"
529 SSH="src/support/lsh.sh --no-cd"
530 FILE_REPL='s/^\([^d][^ ]*\) *\(..........[0-9]\) /\1 \2 /'
531 DIR_REPL='s/^\(d[^ ]*\) *[0-9][.,0-9]* /\1 DIR /'
532 -LS_REPL='s;[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9];####/##/## ##:##:##;'
533 +LS_REPL='s;[0-9][0-9][0-9][0-9]/[0-9][0-9]/[0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9] ;####/##/## ##:##:## ;'
537 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
538 --- a/testsuite/rsync.fns
539 +++ b/testsuite/rsync.fns
540 @@ -219,6 +219,14 @@ checkit() {
541 # We can just write everything to stdout/stderr, because the
542 # wrapper hides it unless there is a problem.
544 + case "x$TLS_ARGS" in
546 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
552 echo "Running: \"$1\""
555 @@ -226,10 +234,17 @@ checkit() {
556 failed="$failed status=$status"
559 + case "x$TLS_ARGS" in
563 + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
568 echo "check how the directory listings compare with diff:"
570 - ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
571 ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
572 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed="$failed dir-diff"
574 diff --git a/tls.c b/tls.c
577 @@ -109,6 +109,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
581 +static int display_atimes = 0;
583 static void failed(char const *what, char const *where)
585 fprintf(stderr, PROGRAM ": %s %s: %s\n",
586 @@ -116,13 +118,38 @@ static void failed(char const *what, char const *where)
590 +static void storetime(char *dest, size_t destsize, time_t t, int nsecs)
594 + struct tm *mt = gmtime(&t);
596 + len = snprintf(dest, destsize,
597 + "%04d-%02d-%02d %02d:%02d:%02d",
598 + (int)mt->tm_year + 1900,
599 + (int)mt->tm_mon + 1,
604 + if (nsecs >= 0 && len >= 0)
605 + snprintf(dest + len, destsize - len, ".%09d", nsecs);
607 + int has_nsecs = nsecs >= 0 ? 1 : 0;
608 + int len = MIN(19 + 9*has_nsecs, (int)destsize - 1);
609 + memset(dest, ' ', len);
614 static void list_file(const char *fname)
617 char permbuf[PERMSTRING_SIZE];
625 if (do_lstat(fname, &buf) < 0)
626 failed("stat", fname);
627 @@ -159,30 +186,17 @@ static void list_file(const char *fname)
630 permstring(permbuf, buf.st_mode);
632 - if (buf.st_mtime) {
634 - mt = gmtime(&buf.st_mtime);
636 - len = snprintf(datebuf, sizeof datebuf,
637 - "%04d-%02d-%02d %02d:%02d:%02d",
638 - (int)mt->tm_year + 1900,
639 - (int)mt->tm_mon + 1,
646 - snprintf(datebuf + len, sizeof datebuf - len,
647 - ".%09d", (int)buf.ST_MTIME_NSEC);
650 + nsecs = (int)buf.ST_MTIME_NSEC;
654 - int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
655 - memset(datebuf, ' ', len);
656 - datebuf[len] = '\0';
659 + storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);
660 + if (display_atimes)
661 + storetime(atimebuf, sizeof atimebuf, S_ISDIR(buf.st_mode) ? 0 : buf.st_atime, -1);
663 + atimebuf[0] = '\0';
665 /* TODO: Perhaps escape special characters in fname? */
667 @@ -193,13 +207,14 @@ static void list_file(const char *fname)
668 (long)minor(buf.st_rdev));
670 printf("%15s", do_big_num(buf.st_size, 1, NULL));
671 - printf(" %6ld.%-6ld %6ld %s %s%s\n",
672 + printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
673 (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
674 - datebuf, fname, linkbuf);
675 + mtimebuf, atimebuf, fname, linkbuf);
678 static struct poptOption long_options[] = {
679 /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
680 + {"atimes", 'U', POPT_ARG_NONE, &display_atimes, 0, 0, 0},
681 {"link-times", 'l', POPT_ARG_NONE, &link_times, 0, 0, 0 },
682 {"link-owner", 'L', POPT_ARG_NONE, &link_owner, 0, 0, 0 },
683 #ifdef SUPPORT_XATTRS
684 @@ -218,6 +233,7 @@ static void tls_usage(int ret)
685 fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
686 fprintf(F,"Trivial file listing program for portably checking rsync\n");
687 fprintf(F,"\nOptions:\n");
688 + fprintf(F," -U, --atimes display access (last-used) times\n");
689 fprintf(F," -l, --link-times display the time on a symlink\n");
690 fprintf(F," -L, --link-owner display the owner+group on a symlink\n");
691 #ifdef SUPPORT_XATTRS
692 diff --git a/util.c b/util.c
695 @@ -117,20 +117,24 @@ void print_child_argv(const char *prefix, char **cmd)
697 /* This returns 0 for success, 1 for a symlink if symlink time-setting
698 * is not possible, or -1 for any other error. */
699 -int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
700 +int set_times(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, mode_t mode)
702 static int switch_step = 0;
704 if (DEBUG_GTE(TIME, 1)) {
705 - rprintf(FINFO, "set modtime of %s to (%ld) %s",
706 + char mtimebuf[200];
708 + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
710 + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
711 fname, (long)modtime,
712 - asctime(localtime(&modtime)));
713 + mtimebuf, (long)atime, timestring(atime));
716 switch (switch_step) {
717 #ifdef HAVE_UTIMENSAT
719 - if (do_utimensat(fname, modtime, mod_nsec) == 0)
720 + if (do_utimensat(fname, modtime, mod_nsec, atime, 0) == 0)
724 @@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
728 - if (do_lutimes(fname, modtime, mod_nsec) == 0)
729 + if (do_lutimes(fname, modtime, mod_nsec, atime, 0) == 0)
733 @@ -159,10 +163,10 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
737 - if (do_utimes(fname, modtime, mod_nsec) == 0)
738 + if (do_utimes(fname, modtime, mod_nsec, atime, 0) == 0)
741 - if (do_utime(fname, modtime, mod_nsec) == 0)
742 + if (do_utime(fname, modtime, mod_nsec, atime, 0) == 0)