X-Git-Url: http://git.samba.org/samba.git/?p=rsync-patches.git;a=blobdiff_plain;f=atimes.diff;h=9ea37a81a496e7691484d0bf423339c34e71130d;hp=7ca9204e0d495b16d4cbfbe756d4553c5081d4b8;hb=30f70b303fdcee47eaab4d19665da477aadaadd9;hpb=93ca4d27d3d0806c3085aef4dbb331ba451b3dc4

diff --git a/atimes.diff b/atimes.diff
index 7ca9204..9ea37a8 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -1,672 +1,544 @@
-After applying this patch and running configure, you MUST run this
-command before "make":
+To use this patch, run these commands for a successful build:
 
-    make proto
+    patch -p1 <patches/atimes.diff
+    ./configure                      (optional if already run)
+    make
 
-
---- orig/batch.c	2006-01-14 08:14:29
-+++ batch.c	2004-07-03 20:15:41
-@@ -225,6 +225,8 @@ void show_flist(int index, struct file_s
- 		rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
- 		rprintf(FINFO, "flist->modtime=%#lx\n",
- 			(long unsigned) fptr[i]->modtime);
-+		rprintf(FINFO, "flist->atime=%#lx\n",
-+			(long unsigned) fptr[i]->atime);
- 		rprintf(FINFO, "flist->length=%.0f\n",
- 			(double) fptr[i]->length);
- 		rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c	2006-01-14 08:14:30
-+++ flist.c	2006-01-14 08:19:03
-@@ -50,6 +50,7 @@ extern int preserve_perms;
- extern int preserve_devices;
+based-on: 1e9ee19a716b72454dfeab663802c626b81cdf2e
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
+@@ -46,6 +46,7 @@ extern int protocol_version;
+ extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
 +extern int preserve_atimes;
+ extern int preserve_acls;
+ extern int preserve_xattrs;
+ extern int need_messages_from_generator;
+@@ -63,7 +64,7 @@ extern char *iconv_opt;
+ #endif
+ 
+ /* These index values are for the file-list's extra-attribute array. */
+-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
++int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+ 
+ int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
+ int sender_symlink_iconv = 0;	/* sender should convert symlink content */
+@@ -140,6 +141,8 @@ void setup_protocol(int f_out,int f_in)
+ 		uid_ndx = ++file_extra_cnt;
+ 	if (preserve_gid)
+ 		gid_ndx = ++file_extra_cnt;
++	if (preserve_atimes)
++		atimes_ndx = (file_extra_cnt += TIME_EXTRA_CNT);
+ 	if (preserve_acls && !am_sender)
+ 		acls_ndx = ++file_extra_cnt;
+ 	if (preserve_xattrs)
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/flist.c
+@@ -53,6 +53,7 @@ extern int preserve_specials;
+ extern int delete_during;
+ extern int missing_args;
+ extern int eol_nulls;
++extern int atimes_ndx;
  extern int relative_paths;
  extern int implied_dirs;
- extern int copy_links;
-@@ -140,16 +141,18 @@ static void list_file_entry(struct file_
- 
- #ifdef SUPPORT_LINKS
- 	if (preserve_links && S_ISLNK(f->mode)) {
--		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
-+		rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
- 			perms,
- 			(double)f->length, timestring(f->modtime),
-+			timestring(f->atime),
- 			f_name(f), f->u.link);
- 	} else
+ extern int ignore_perishable;
+@@ -397,7 +398,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  #endif
- 	{
--		rprintf(FINFO, "%s %11.0f %s %s\n",
-+		rprintf(FINFO, "%s %11.0f %s %s %s\n",
- 			perms,
- 			(double)f->length, timestring(f->modtime),
-+			timestring(f->atime),
- 			f_name(f));
- 	}
- }
-@@ -311,6 +314,7 @@ void send_file_entry(struct file_struct 
+ 			    int ndx, int first_ndx)
  {
- 	unsigned short flags;
- 	static time_t modtime;
-+	static time_t atime;
+-	static time_t modtime;
++	static time_t modtime, atime;
  	static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
-@@ -326,7 +330,7 @@ void send_file_entry(struct file_struct 
- 
- 	if (!file) {
- 		write_byte(f, 0);
--		modtime = 0, mode = 0;
-+		modtime = 0, atime = 0, mode = 0;
- 		dev = 0, rdev = makedev(0, 0);
- 		rdev_major = 0;
- 		uid = 0, gid = 0;
-@@ -375,6 +379,12 @@ void send_file_entry(struct file_struct 
- 		flags |= XMIT_SAME_TIME;
- 	else
+@@ -497,6 +498,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
  		modtime = file->modtime;
-+	if (preserve_atimes && !S_ISDIR(mode)) {
-+		if (file->atime == atime)
-+			flags |= XMIT_SAME_ATIME;
+ 	if (NSEC_BUMP(file) && protocol_version >= 31)
+ 		xflags |= XMIT_MOD_NSEC;
++	if (atimes_ndx && !S_ISDIR(mode)) {
++		time_t file_atime = f_atime(file);
++		if (file_atime == atime)
++			xflags |= XMIT_SAME_ATIME;
 +		else
-+			atime = file->atime;
++			atime = file_atime;
 +	}
  
  #ifdef SUPPORT_HARD_LINKS
- 	if (file->link_u.idev) {
-@@ -428,6 +438,8 @@ void send_file_entry(struct file_struct 
- 		write_int(f, modtime);
- 	if (!(flags & XMIT_SAME_MODE))
+ 	if (tmp_dev != -1) {
+@@ -583,6 +591,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ 		write_varint(f, F_MOD_NSEC(file));
+ 	if (!(xflags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
-+	if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
-+		write_int(f, atime);
- 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- 		if (!numeric_ids)
- 			add_uid(uid);
-@@ -495,6 +507,7 @@ static struct file_struct *receive_file_
- 					      unsigned short flags, int f)
++	if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
++		write_varlong(f, atime, 4);
+ 	if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
+ 		if (protocol_version < 30)
+ 			write_int(f, uid);
+@@ -670,7 +680,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ 
+ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)
  {
- 	static time_t modtime;
-+	static time_t atime;
+-	static int64 modtime;
++	static int64 modtime, atime;
  	static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
-@@ -513,7 +526,7 @@ static struct file_struct *receive_file_
- 	struct file_struct *file;
- 
- 	if (!flist) {
--		modtime = 0, mode = 0;
-+		modtime = 0, atime = 0, mode = 0;
- 		dev = 0, rdev = makedev(0, 0);
- 		rdev_major = 0;
- 		uid = 0, gid = 0;
-@@ -569,6 +582,8 @@ static struct file_struct *receive_file_
- 		modtime = (time_t)read_int(f);
- 	if (!(flags & XMIT_SAME_MODE))
+@@ -814,6 +824,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+ 		modtime_nsec = 0;
+ 	if (!(xflags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
-+	if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
-+		atime = (time_t)read_int(f);
- 
- 	if (preserve_uid && !(flags & XMIT_SAME_UID))
- 		uid = (uid_t)read_int(f);
-@@ -619,6 +634,7 @@ static struct file_struct *receive_file_
- 
- 	file->flags = 0;
- 	file->modtime = modtime;
-+	file->atime = atime;
- 	file->length = file_length;
- 	file->mode = mode;
- 	file->uid = uid;
-@@ -866,6 +882,7 @@ struct file_struct *make_file(char *fnam
- 
- 	file->flags = flags;
- 	file->modtime = st.st_mtime;
-+	file->atime = st.st_atime;
- 	file->length = st.st_size;
- 	if (chmod_modes && am_sender && (S_ISREG(st.st_mode) || S_ISDIR(st.st_mode)))
- 		file->mode = tweak_mode(st.st_mode, chmod_modes);
---- orig/generator.c	2006-01-14 08:14:30
-+++ generator.c	2005-12-15 23:05:32
-@@ -44,6 +44,7 @@ extern int preserve_uid;
- extern int preserve_gid;
- extern int preserve_times;
- extern int omit_dir_times;
-+extern int preserve_atimes;
- extern int delete_before;
- extern int delete_during;
- extern int delete_after;
-@@ -343,10 +344,18 @@ void itemize(struct file_struct *file, i
- 
- 		if (S_ISREG(file->mode) && file->length != st->st_size)
- 			iflags |= ITEM_REPORT_SIZE;
--		if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
--		     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
--		    || (keep_time && cmp_modtime(file->modtime, st->st_mtime) != 0))
-+		if (iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
-+		     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) {
- 			iflags |= ITEM_REPORT_TIME;
-+			if (!preserve_atimes && !S_ISDIR(file->mode))
-+				iflags |= ITEM_REPORT_ATIME;
-+		} else {
-+			if (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)
-+				iflags |= ITEM_REPORT_TIME;
-+			if (preserve_atimes && !S_ISDIR(file->mode)
-+			 && cmp_time(file->atime, st->st_atime) != 0)
-+				iflags |= ITEM_REPORT_ATIME;
++	if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
++		atime = read_varlong(f, 4);
++#if SIZEOF_TIME_T < SIZEOF_INT64
++		if (!am_generator && (int64)(time_t)atime != atime) {
++			rprintf(FERROR_XFER,
++				"Access time value of %s truncated on receiver.\n",
++				lastname);
 +		}
- 		if (preserve_perms
- 		 && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
- 			iflags |= ITEM_REPORT_PERMS;
-@@ -395,7 +404,7 @@ int unchanged_file(char *fn, struct file
- 	if (ignore_times)
- 		return 0;
- 
--	return cmp_modtime(st->st_mtime, file->modtime) == 0;
-+	return cmp_time(st->st_mtime, file->modtime) == 0;
- }
++#endif
++	}
  
+ 	if (chmod_modes && !S_ISLNK(mode) && mode)
+ 		mode = tweak_mode(mode, chmod_modes);
+@@ -974,6 +994,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+ 		F_GROUP(file) = gid;
+ 		file->flags |= gid_flags;
+ 	}
++	if (atimes_ndx)
++		f_atime_set(file, (time_t)atime);
+ 	if (unsort_ndx)
+ 		F_NDX(file) = flist->used + flist->ndx_start;
+ 
+@@ -1371,6 +1393,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
+ 		F_GROUP(file) = st.st_gid;
+ 	if (am_generator && st.st_uid == our_uid)
+ 		file->flags |= FLAG_OWNED_BY_US;
++	if (atimes_ndx)
++		f_atime_set(file, st.st_atime);
+ 
+ 	if (basename != thisname)
+ 		file->dirname = lastdir;
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -496,6 +496,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+ 		 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
+ 		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ 			iflags |= ITEM_REPORT_TIME;
++		if (atimes_ndx && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
++		 && cmp_time(f_atime(file), sxp->st.st_atime) != 0)
++			iflags |= ITEM_REPORT_ATIME;
+ #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
+ 		if (S_ISLNK(file->mode)) {
+ 			;
+@@ -907,6 +910,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
+ 		if (link_dest) {
+ 			if (!hard_link_one(file, fname, cmpbuf, 1))
+ 				goto try_a_copy;
++			if (atimes_ndx)
++				set_file_attrs(fname, file, sxp, NULL, 0);
+ 			if (preserve_hard_links && F_IS_HLINKED(file))
+ 				finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
+ 			if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
+@@ -1109,6 +1114,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+ static void list_file_entry(struct file_struct *f)
+ {
+ 	char permbuf[PERMSTRING_SIZE];
++	time_t atime = atimes_ndx ? f_atime(f) : 0;
+ 	int64 len;
+ 	int colwidth = human_readable ? 14 : 11;
  
-@@ -555,7 +564,7 @@ static int find_fuzzy(struct file_struct
- 		name = fp->basename;
+@@ -1124,10 +1130,11 @@ static void list_file_entry(struct file_struct *f)
  
- 		if (fp->length == file->length
--		    && cmp_modtime(fp->modtime, file->modtime) == 0) {
-+		    && cmp_time(fp->modtime, file->modtime) == 0) {
- 			if (verbose > 4) {
- 				rprintf(FINFO,
- 					"fuzzy size/modtime match for %s\n",
-@@ -1068,7 +1077,7 @@ static void recv_generator(char *fname, 
+ #ifdef SUPPORT_LINKS
+ 	if (preserve_links && S_ISLNK(f->mode)) {
+-		rprintf(FINFO, "%s %*s %s %s -> %s\n",
++		rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
+ 			permbuf, colwidth, human_num(len),
+-			timestring(f->modtime), f_name(f, NULL),
+-			F_SYMLINK(f));
++			timestring(f->modtime),
++			atimes_ndx ? timestring(atime) : "",
++			f_name(f, NULL), F_SYMLINK(f));
+ 	} else
+ #endif
+ 	if (missing_args == 2 && f->mode == 0) {
+@@ -1135,9 +1142,11 @@ static void list_file_entry(struct file_struct *f)
+ 			colwidth + 31, "*missing",
+ 			f_name(f, NULL));
+ 	} else {
+-		rprintf(FINFO, "%s %*s %s %s\n",
++		rprintf(FINFO, "%s %*s %s %s %s\n",
+ 			permbuf, colwidth, human_num(len),
+-			timestring(f->modtime), f_name(f, NULL));
++			timestring(f->modtime),
++			atimes_ndx ? timestring(atime) : "",
++			f_name(f, NULL));
  	}
+ }
  
- 	if (update_only && statret == 0
--	    && cmp_modtime(st.st_mtime, file->modtime) > 0) {
-+	    && cmp_time(st.st_mtime, file->modtime) > 0) {
- 		if (verbose > 1)
- 			rprintf(FINFO, "%s is newer\n", fname);
- 		return;
---- orig/log.c	2006-01-14 08:14:30
-+++ log.c	2005-12-15 23:05:44
-@@ -38,6 +38,7 @@ extern int module_id;
- extern int msg_fd_out;
- extern int protocol_version;
- extern int preserve_times;
-+extern int preserve_atimes;
- extern int log_format_has_i;
- extern int log_format_has_o_or_i;
- extern int daemon_log_format_has_o_or_i;
-@@ -517,11 +518,14 @@ static void log_formatted(enum logcode c
- 			n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
- 			     : !preserve_times || IS_DEVICE(file->mode)
- 					       || S_ISLNK(file->mode) ? 'T' : 't';
--			n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
--			n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
--			n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
--			n[8] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
--			n[9] = '\0';
-+			n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.'
-+			     : !preserve_atimes || IS_DEVICE(file->mode)
-+					        || S_ISLNK(file->mode) ? 'A' : 'a';
-+			n[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
-+			n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
-+			n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
-+			n[9] = !(iflags & ITEM_REPORT_XATTRS) ? '.' : 'a';
-+			n[10] = '\0';
- 
- 			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
- 				char ch = iflags & ITEM_IS_NEW ? '+' : '?';
---- orig/options.c	2006-01-14 08:14:30
-+++ options.c	2005-11-07 04:32:19
-@@ -50,6 +50,7 @@ int preserve_uid = 0;
+@@ -2034,7 +2043,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+ 			STRUCT_STAT st;
+ 			if (link_stat(fname, &st, 0) == 0
+ 			 && cmp_time(st.st_mtime, file->modtime) != 0)
+-				set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode);
++				set_times(fname, file->modtime, F_MOD_NSEC(file), file->modtime, file->mode);
+ 		}
+ 		if (counter >= loopchk_limit) {
+ 			if (allowed_lull)
+diff --git a/ifuncs.h b/ifuncs.h
+--- a/ifuncs.h
++++ b/ifuncs.h
+@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb)
+ 	memset(xb, 0, sizeof (xbuf));
+ }
+ 
++static inline time_t
++f_atime(struct file_struct *fp)
++{
++#if SIZEOF_TIME_T > 4
++	time_t atime;
++	memcpy(&atime, &REQ_EXTRA(fp, atimes_ndx)->unum, SIZEOF_TIME_T);
++	return atime;
++#else
++	return REQ_EXTRA(fp, atimes_ndx)->unum;
++#endif
++}
++
++static inline void
++f_atime_set(struct file_struct *fp, time_t atime)
++{
++#if SIZEOF_TIME_T > 4
++	memcpy(&REQ_EXTRA(fp, atimes_ndx)->unum, &atime, SIZEOF_TIME_T);
++#else
++	REQ_EXTRA(fp, atimes_ndx)->unum = (uint32)atime;
++#endif
++}
++
+ static inline int
+ to_wire_mode(mode_t mode)
+ {
+diff --git a/log.c b/log.c
+--- a/log.c
++++ b/log.c
+@@ -729,7 +729,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+ 			c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ 			c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ 			c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+-			c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
++			c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
++			     : S_ISLNK(file->mode) ? 'U' : 'u';
+ 			c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+ 			c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+ 			c[11] = '\0';
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -59,6 +59,7 @@ int preserve_specials = 0;
+ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
- int omit_dir_times = 0;
 +int preserve_atimes = 0;
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -293,8 +294,9 @@ void usage(enum logcode F)
-   rprintf(F," -o, --owner                 preserve owner (root only)\n");
-   rprintf(F," -g, --group                 preserve group\n");
-   rprintf(F," -D, --devices               preserve devices (root only)\n");
--  rprintf(F," -t, --times                 preserve times\n");
--  rprintf(F," -O, --omit-dir-times        omit directories when preserving times\n");
-+  rprintf(F," -t, --times                 preserve modify times\n");
-+  rprintf(F," -O, --omit-dir-times        omit directories when preserving modify times\n");
-+  rprintf(F," -A, --atimes                preserve access times\n");
-   rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
-   rprintf(F," -S, --sparse                handle sparse files efficiently\n");
-   rprintf(F," -n, --dry-run               show what would have been transferred\n");
-@@ -402,6 +404,9 @@ static struct poptOption long_options[] 
+@@ -708,6 +709,7 @@ void usage(enum logcode F)
+   rprintf(F,"     --specials              preserve special files\n");
+   rprintf(F," -D                          same as --devices --specials\n");
+   rprintf(F," -t, --times                 preserve modification times\n");
++  rprintf(F," -U, --atimes                preserve access (last-used) times\n");
+   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
+   rprintf(F," -J, --omit-link-times       omit symlinks from --times\n");
+   rprintf(F,"     --super                 receiver attempts super-user activities\n");
+@@ -865,6 +867,9 @@ static struct poptOption long_options[] = {
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-+  {"atimes",          'A', POPT_ARG_VAL,    &preserve_atimes, 1, 0, 0 },
++  {"atimes",          'U', POPT_ARG_VAL,    &preserve_atimes, 1, 0, 0 },
 +  {"no-atimes",        0,  POPT_ARG_VAL,    &preserve_atimes, 0, 0, 0 },
-+  {"no-A",             0,  POPT_ARG_VAL,    &preserve_atimes, 0, 0, 0 },
-   {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 2, 0, 0 },
-   {"modify-window",    0,  POPT_ARG_INT,    &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
-   {"owner",           'o', POPT_ARG_VAL,    &preserve_uid, 1, 0, 0 },
-@@ -1442,6 +1447,8 @@ void server_options(char **args,int *arg
++  {"no-U",             0,  POPT_ARG_VAL,    &preserve_atimes, 0, 0, 0 },
+   {"omit-dir-times",  'O', POPT_ARG_VAL,    &omit_dir_times, 1, 0, 0 },
+   {"no-omit-dir-times",0,  POPT_ARG_VAL,    &omit_dir_times, 0, 0, 0 },
+   {"no-O",             0,  POPT_ARG_VAL,    &omit_dir_times, 0, 0, 0 },
+@@ -2428,6 +2433,8 @@ void server_options(char **args, int *argc_p)
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
 +	if (preserve_atimes)
-+		argstr[x++] = 'A';
- 	if (omit_dir_times == 2 && am_sender)
- 		argstr[x++] = 'O';
++		argstr[x++] = 'U';
  	if (preserve_perms)
---- orig/rsync.c	2006-01-14 08:14:31
-+++ rsync.c	2005-07-28 00:17:37
-@@ -27,6 +27,7 @@ extern int dry_run;
- extern int daemon_log_format_has_i;
- extern int preserve_times;
- extern int omit_dir_times;
-+extern int preserve_atimes;
- extern int am_root;
- extern int am_server;
- extern int am_sender;
-@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st
+ 		argstr[x++] = 'p';
+ 	else if (preserve_executability && am_sender)
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -458,6 +458,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  	int updated = 0;
- 	STRUCT_STAT st2;
+ 	stat_x sx2;
  	int change_uid, change_gid;
 +	time_t atime, mtime;
+ 	mode_t new_mode = file->mode;
+ 	int inherit;
  
- 	if (!st) {
- 		if (dry_run)
-@@ -70,16 +72,29 @@ int set_perms(char *fname,struct file_st
- 
- 	if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times))
- 		flags |= PERMS_SKIP_MTIME;
-+	if (!preserve_atimes || S_ISDIR(st->st_mode))
-+		flags |= PERMS_SKIP_ATIME;
- 	if (!(flags & PERMS_SKIP_MTIME)
--	    && cmp_modtime(st->st_mtime, file->modtime) != 0) {
--		int ret = set_modtime(fname, file->modtime, st->st_mode);
-+	    && cmp_time(st->st_mtime, file->modtime) != 0) {
+@@ -496,22 +497,40 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+ 		set_xattr(fname, file, fnamecmp, sxp);
+ #endif
+ 
++	/* This code must be the first update in the function due to
++	 * how it uses the "updated" variable. */
+ 	if (!preserve_times
+ 	 || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
+ 	 || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
+ 		flags |= ATTRS_SKIP_MTIME;
++	if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
++		flags |= ATTRS_SKIP_ATIME;
+ 	if (!(flags & ATTRS_SKIP_MTIME)
+ 	    && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+-		int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);
 +		mtime = file->modtime;
 +		updated = 1;
 +	} else
-+		mtime = st->st_mtime;
-+	if (!(flags & PERMS_SKIP_ATIME)
-+	    && cmp_time(st->st_atime, file->atime) != 0) {
-+		atime = file->atime;
-+		updated = 1;
++		mtime = sxp->st.st_mtime;
++	if (!(flags & ATTRS_SKIP_ATIME)) {
++		time_t file_atime = f_atime(file);
++		if (cmp_time(sxp->st.st_atime, file_atime) != 0) {
++			atime = file_atime;
++			updated = 1;
++		} else
++			atime = sxp->st.st_atime;
 +	} else
-+		atime = st->st_atime;
++		atime = sxp->st.st_atime;
 +	if (updated) {
-+		int ret = set_times(fname, mtime, atime, st->st_mode);
++		int ret = set_times(fname, mtime, F_MOD_NSEC(file), atime, sxp->st.st_mode);
  		if (ret < 0) {
- 			rsyserr(FERROR, errno, "failed to set times on %s",
+ 			rsyserr(FERROR_XFER, errno, "failed to set times on %s",
  				full_fname(fname));
- 			return 0;
+ 			goto cleanup;
  		}
 -		if (ret == 0) /* ret == 1 if symlink could not be set */
 -			updated = 1;
-+		if (ret > 0) /* ret == 1 if symlink could not be set */
+-		else
++		if (ret > 0) { /* ret == 1 if symlink could not be set */
 +			updated = 0;
+ 			file->flags |= FLAG_TIME_FAILED;
++		}
  	}
  
- 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2006-01-14 08:14:31
-+++ rsync.h	2005-07-28 00:04:51
-@@ -54,6 +54,7 @@
- #define XMIT_HAS_IDEV_DATA (1<<9)
- #define XMIT_SAME_DEV (1<<10)
- #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
-+#define XMIT_SAME_ATIME (1<<12)
+ 	change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
+@@ -662,7 +681,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+ 
+ 	/* Change permissions before putting the file into place. */
+ 	set_file_attrs(fnametmp, file, NULL, fnamecmp,
+-		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
++		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
+ 
+ 	/* move tmp file over real file */
+ 	if (DEBUG_GTE(RECV, 1))
+@@ -687,7 +706,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+ 
+   do_set_file_attrs:
+ 	set_file_attrs(fnametmp, file, NULL, fnamecmp,
+-		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME);
++		       ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
+ 
+ 	if (temp_copy_name) {
+ 		if (do_rename(fnametmp, fname) < 0) {
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -62,6 +62,7 @@
+ #define XMIT_HLINK_FIRST (1<<12)	/* protocols 30 - now (HLINKED files only) */
+ #define XMIT_IO_ERROR_ENDLIST (1<<12)	/* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
+ #define XMIT_MOD_NSEC (1<<13)		/* protocols 31 - now */
++#define XMIT_SAME_ATIME (1<<14)		/* protocols ?? - now */
  
  /* These flags are used in the live flist data. */
  
-@@ -119,6 +120,7 @@
+@@ -165,6 +166,7 @@
  
- #define PERMS_REPORT		(1<<0)
- #define PERMS_SKIP_MTIME	(1<<1)
-+#define PERMS_SKIP_ATIME	(1<<2)
+ #define ATTRS_REPORT		(1<<0)
+ #define ATTRS_SKIP_MTIME	(1<<1)
++#define ATTRS_SKIP_ATIME	(1<<2)
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -135,6 +137,7 @@
- #define FNAMECMP_FUZZY		0x83
- 
- /* For use by the itemize_changes code */
-+#define ITEM_REPORT_ATIME (1<<0)
- #define ITEM_REPORT_CHECKSUM (1<<1)
- #define ITEM_REPORT_SIZE (1<<2)
- #define ITEM_REPORT_TIME (1<<3)
-@@ -516,6 +519,7 @@ struct file_struct {
- 		struct hlink *links;
- 	} link_u;
- 	time_t modtime;
-+	time_t atime;
- 	uid_t uid;
- 	gid_t gid;
- 	mode_t mode;
---- orig/rsync.yo	2006-01-14 08:14:31
-+++ rsync.yo	2005-11-07 04:34:55
-@@ -319,8 +319,9 @@ to the detailed description below for a 
-  -o, --owner                 preserve owner (root only)
-  -g, --group                 preserve group
-  -D, --devices               preserve devices (root only)
-- -t, --times                 preserve times
-- -O, --omit-dir-times        omit directories when preserving times
-+ -t, --times                 preserve modify times
-+ -O, --omit-dir-times        omit directories when preserving mod-times
-+ -A, --atimes                preserve access times
-      --chmod=CHMOD           change destination permissions
-  -S, --sparse                handle sparse files efficiently
-  -n, --dry-run               show what would have been transferred
-@@ -711,6 +712,12 @@ it is preserving modification times (see
- the directories on the receiving side, it is a good idea to use bf(-O).
- This option is inferred if you use bf(--backup) without bf(--backup-dir).
- 
-+dit(bf(-A, --atimes)) This tells rsync to set the access times of the
+@@ -708,12 +710,14 @@ extern int file_extra_cnt;
+ extern int inc_recurse;
+ extern int uid_ndx;
+ extern int gid_ndx;
++extern int atimes_ndx;
+ extern int acls_ndx;
+ extern int xattrs_ndx;
+ 
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+ #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN)
++#define TIME_EXTRA_CNT ((SIZEOF_TIME_T + EXTRA_LEN - 1) / EXTRA_LEN)
+ #define DEV_EXTRA_CNT 2
+ #define DIRNODE_EXTRA_CNT 3
+ #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN)
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -369,6 +369,7 @@ to the detailed description below for a complete description.  verb(
+      --specials              preserve special files
+  -D                          same as --devices --specials
+  -t, --times                 preserve modification times
++ -U, --atimes                preserve access (use) times
+  -O, --omit-dir-times        omit directories from --times
+  -J, --omit-link-times       omit symlinks from --times
+      --super                 receiver attempts super-user activities
+@@ -1162,6 +1163,12 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
+ updated (though rsync's delta-transfer algorithm will make the update fairly efficient
+ if the files haven't actually changed, you're much better off using bf(-t)).
+ 
++dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
 +destination files to the same value as the source files.  Note that the
 +reading of the source file may update the atime of the source files, so
 +repeated rsync runs with --atimes may be needed if you want to force the
 +access-time values to be 100% identical on the two systems.
 +
- dit(bf(--chmod)) This options tells rsync to apply the listed "chmod" pattern
- to the permission of the files on the destination.  In addition to the normal
- parsing rules specified in the chmod manpage, you can specify an item that
-@@ -1160,7 +1167,7 @@ changes that are being made to each file
- This is exactly the same as specifying bf(--log-format='%i %n%L').
- 
- The "%i" escape has a cryptic output that is 9 letters long.  The general
--format is like the string bf(UXcstpoga)), where bf(U) is replaced by the
-+format is like the string bf(UXcstapogx)), where bf(U) is replaced by the
- kind of update being done, bf(X) is replaced by the file-type, and the
- other letters represent attributes that may be output if they are being
- modified.
-@@ -1199,17 +1206,22 @@ quote(itemize(
-   by the file transfer.
-   it() A bf(t) means the modification time is different and is being updated
-   to the sender's value (requires bf(--times)).  An alternate value of bf(T)
--  means that the time will be set to the transfer time, which happens
-+  means that the modify time will be set to the transfer time, which happens
-   anytime a symlink is transferred, or when a file or device is transferred
-   without bf(--times).
-+  it() A bf(a) means the access time is different and is being updated to
-+  the sender's value (requires bf(--atimes)).  An alternate value of bf(A)
-+  means that the access time  will be set to the transfer time, which happens
-+  anytime a symlink is transferred, or when a file or device is transferred
-+  without bf(--atimes).
-   it() A bf(p) means the permissions are different and are being updated to
-   the sender's value (requires bf(--perms)).
-   it() An bf(o) means the owner is different and is being updated to the
-   sender's value (requires bf(--owner) and root privileges).
+ dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
+ it is preserving modification times (see bf(--times)).  If NFS is sharing
+ the directories on the receiving side, it is a good idea to use bf(-O).
+@@ -2092,7 +2099,10 @@ quote(itemization(
+   sender's value (requires bf(--owner) and super-user privileges).
    it() A bf(g) means the group is different and is being updated to the
    sender's value (requires bf(--group) and the authority to set the group).
--  it() The bf(a) is reserved for a future enhanced version that supports
--  extended file attributes, such as ACLs.
-+  it() The bf(x) is reserved for a future enhanced version that supports
-+  extended file attributes.
+-  it() The bf(u) slot is reserved for future use.
++  it() A bf(u) means the access (use) time is different and is being updated to
++  the sender's value (requires bf(--atimes)).  An alternate value of bf(U)
++  means that the access time will be set to the transfer time, which happens
++  when a symlink or directory is updated.
+   it() The bf(a) means that the ACL information changed.
+   it() The bf(x) means that the extended attribute information changed.
  ))
+diff --git a/syscall.c b/syscall.c
+--- a/syscall.c
++++ b/syscall.c
+@@ -349,15 +349,15 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
+ }
+ 
+ #ifdef HAVE_UTIMENSAT
+-int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
++int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
+ {
+ 	struct timespec t[2];
+ 
+ 	if (dry_run) return 0;
+ 	RETURN_ERROR_IF_RO_OR_LO;
+ 
+-	t[0].tv_sec = 0;
+-	t[0].tv_nsec = UTIME_NOW;
++	t[0].tv_sec = atime;
++	t[0].tv_nsec = a_nsec;
+ 	t[1].tv_sec = modtime;
+ 	t[1].tv_nsec = mod_nsec;
+ 	return utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW);
+@@ -365,15 +365,15 @@ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
+ #endif
  
- One other output is possible:  when deleting files, the "%i" will output
---- orig/testsuite/atimes.test	2004-06-30 00:06:23
-+++ testsuite/atimes.test	2004-06-30 00:06:23
-@@ -0,0 +1,19 @@
+ #ifdef HAVE_LUTIMES
+-int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
++int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
+ {
+ 	struct timeval t[2];
+ 
+ 	if (dry_run) return 0;
+ 	RETURN_ERROR_IF_RO_OR_LO;
+ 
+-	t[0].tv_sec = time(NULL);
+-	t[0].tv_usec = 0;
++	t[0].tv_sec = atime;
++	t[0].tv_usec = a_nsec;
+ 	t[1].tv_sec = modtime;
+ 	t[1].tv_usec = mod_nsec / 1000;
+ 	return lutimes(fname, t);
+@@ -381,22 +381,22 @@ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
+ #endif
+ 
+ #ifdef HAVE_UTIMES
+-int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec)
++int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
+ {
+ 	struct timeval t[2];
+ 
+ 	if (dry_run) return 0;
+ 	RETURN_ERROR_IF_RO_OR_LO;
+ 
+-	t[0].tv_sec = time(NULL);
+-	t[0].tv_usec = 0;
++	t[0].tv_sec = atime;
++	t[0].tv_usec = a_nsec;
+ 	t[1].tv_sec = modtime;
+ 	t[1].tv_usec = mod_nsec / 1000;
+ 	return utimes(fname, t);
+ }
+ 
+ #elif defined HAVE_UTIME
+-int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
++int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec), time_t atime, UNUSED(uint32 a_nsec))
+ {
+ #ifdef HAVE_STRUCT_UTIMBUF
+ 	struct utimbuf tbuf;
+@@ -408,11 +408,11 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
+ 	RETURN_ERROR_IF_RO_OR_LO;
+ 
+ # ifdef HAVE_STRUCT_UTIMBUF
+-	tbuf.actime = time(NULL);
++	tbuf.actime = atime;
+ 	tbuf.modtime = modtime;
+ 	return utime(fname, &tbuf);
+ # else
+-	t[0] = time(NULL);
++	t[0] = atime;
+ 	t[1] = modtime;
+ 	return utime(fname, t);
+ # endif
+diff --git a/testsuite/atimes.test b/testsuite/atimes.test
+new file mode 100644
+--- /dev/null
++++ b/testsuite/atimes.test
+@@ -0,0 +1,17 @@
 +#! /bin/sh
 +
 +# Test rsync copying atimes
 +
 +. "$suitedir/rsync.fns"
 +
-+set -x
-+
 +mkdir "$fromdir"
 +
 +touch "$fromdir/foo"
 +touch -a -t 200102031717.42 "$fromdir/foo"
 +
-+TLS_ARGS=--atime
++TLS_ARGS=--atimes
 +
-+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
++checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
---- orig/testsuite/itemize.test	2005-12-15 23:00:49
-+++ testsuite/itemize.test	2005-12-15 23:11:34
-@@ -44,14 +44,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
- $RSYNC -iplr "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
--cd+++++++ bar/
--cd+++++++ bar/baz/
-->f+++++++ bar/baz/rsync
--cd+++++++ foo/
-->f+++++++ foo/config1
-->f+++++++ foo/config2
-->f+++++++ foo/extra
--cL+++++++ foo/sym -> ../bar/baz/rsync
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+>f++++++++ bar/baz/rsync
-+cd++++++++ foo/
-+>f++++++++ foo/config1
-+>f++++++++ foo/config2
-+>f++++++++ foo/extra
-+cL++++++++ foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
- 
-@@ -63,10 +63,10 @@ chmod 601 "$fromdir/foo/config2"
- $RSYNC -iplrH "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
-->f..T.... bar/baz/rsync
-->f..T.... foo/config1
-->f.sTp... foo/config2
--hf..T.... foo/extra => foo/config1
-+>f..TA.... bar/baz/rsync
-+>f..TA.... foo/config1
-+>f.sTAp... foo/config2
-+hf..TA.... foo/extra => foo/config1
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
- 
-@@ -83,11 +83,11 @@ chmod 777 "$todir/bar/baz/rsync"
- $RSYNC -iplrtc "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
--.f..tp... bar/baz/rsync
--.d..t.... foo/
--.f..t.... foo/config1
-->fcstp... foo/config2
--cL..T.... foo/sym -> ../bar/baz/rsync
-+.f..t.p... bar/baz/rsync
-+.d..t..... foo/
-+.f..t..... foo/config1
-+>fcst.p... foo/config2
-+cL..TA.... foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
- 
-@@ -112,15 +112,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
-     | tee "$outfile"
- filter_outfile
- cat <<EOT >"$chkfile"
--.d        ./
--.d        bar/
--.d        bar/baz/
--.f...p... bar/baz/rsync
--.d        foo/
--.f        foo/config1
-->f..t.... foo/config2
--hf        foo/extra
--.L        foo/sym -> ../bar/baz/rsync
-+.d         ./
-+.d         bar/
-+.d         bar/baz/
-+.f....p... bar/baz/rsync
-+.d         foo/
-+.f         foo/config1
-+>f..t..... foo/config2
-+hf         foo/extra
-+.L         foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
- 
-@@ -139,8 +139,8 @@ touch "$todir/foo/config2"
- $RSYNC -iplrtH "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
--.f...p... foo/config1
-->f..t.... foo/config2
-+.f....p... foo/config1
-+>f..t..... foo/config2
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
- 
-@@ -149,15 +149,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$
-     | tee "$outfile"
- filter_outfile
- cat <<EOT >"$chkfile"
--.d..t.... ./
--cd+++++++ bar/
--cd+++++++ bar/baz/
--cf        bar/baz/rsync
--cd+++++++ foo/
--cf        foo/config1
--cf        foo/config2
--hf        foo/extra => foo/config1
--cL..T.... foo/sym -> ../bar/baz/rsync
-+.d..t..... ./
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+cf         bar/baz/rsync
-+cd++++++++ foo/
-+cf         foo/config1
-+cf         foo/config2
-+hf         foo/extra => foo/config1
-+cL..T..... foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
- 
-@@ -165,11 +165,11 @@ rm -rf "$todir"
- $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
--.d..t.... ./
--cd+++++++ bar/
--cd+++++++ bar/baz/
--cd+++++++ foo/
--hf        foo/extra => foo/config1
-+.d..t..... ./
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+cd++++++++ foo/
-+hf         foo/extra => foo/config1
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
- 
-@@ -196,15 +196,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$
-     | tee "$outfile"
- filter_outfile
- cat <<EOT >"$chkfile"
--.d..t.... ./
--cd+++++++ bar/
--cd+++++++ bar/baz/
--hf        bar/baz/rsync
--cd+++++++ foo/
--hf        foo/config1
--hf        foo/config2
--hf        foo/extra => foo/config1
--hL        foo/sym -> ../bar/baz/rsync
-+.d..t..... ./
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+hf         bar/baz/rsync
-+cd++++++++ foo/
-+hf         foo/config1
-+hf         foo/config2
-+hf         foo/extra => foo/config1
-+hL         foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
- 
-@@ -212,10 +212,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
--.d..t.... ./
--cd+++++++ bar/
--cd+++++++ bar/baz/
--cd+++++++ foo/
-+.d..t..... ./
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+cd++++++++ foo/
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
- 
-@@ -243,14 +243,14 @@ filter_outfile
- # TODO fix really-old problem when combining -H with --compare-dest:
- # missing output for foo/extra hard-link (and it might not be updated)!
- cat <<EOT >"$chkfile"
--.d..t.... ./
--cd+++++++ bar/
--cd+++++++ bar/baz/
--.f        bar/baz/rsync
--cd+++++++ foo/
--.f        foo/config1
--.f        foo/config2
--.L        foo/sym -> ../bar/baz/rsync
-+.d..t..... ./
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+.f         bar/baz/rsync
-+cd++++++++ foo/
-+.f         foo/config1
-+.f         foo/config2
-+.L         foo/sym -> ../bar/baz/rsync
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
- 
-@@ -258,10 +258,10 @@ rm -rf "$todir"
- $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \
-     | tee "$outfile"
- cat <<EOT >"$chkfile"
--.d..t.... ./
--cd+++++++ bar/
--cd+++++++ bar/baz/
--cd+++++++ foo/
-+.d..t..... ./
-+cd++++++++ bar/
-+cd++++++++ bar/baz/
-+cd++++++++ foo/
- EOT
- diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
- 
---- orig/testsuite/rsync.fns	2005-06-10 21:33:28
-+++ testsuite/rsync.fns	2005-07-28 00:41:20
-@@ -50,7 +50,7 @@ printmsg() {
- 
- 
- rsync_ls_lR() {
--    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls"
-+    find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS
- }
- 
- rsync_getgroups() { 
-@@ -158,6 +158,10 @@ checkit() {
+diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
+--- a/testsuite/rsync.fns
++++ b/testsuite/rsync.fns
+@@ -219,6 +219,10 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
-+    if test x$TLS_ARGS = x--atime; then
++    if test x$TLS_ARGS = x--atimes; then
 +	( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
 +    fi
 +
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -165,10 +169,13 @@ checkit() {
- 	failed="YES";
+@@ -226,10 +230,13 @@ checkit() {
+ 	failed="$failed status=$status"
      fi
  
-+    if test x$TLS_ARGS != x--atime; then
++    if test x$TLS_ARGS != x--atimes; then
 +	( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
 +    fi
 +
@@ -675,47 +547,49 @@ command before "make":
      echo ""
 -    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
-     diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
- 
---- orig/tls.c	2005-09-24 17:40:31
-+++ tls.c	2005-03-23 17:49:48
-@@ -39,6 +39,7 @@
- 
- 
- #include "rsync.h"
-+#include "popt.h"
+     diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed="$failed dir-diff"
  
- #define PROGRAM "tls"
+diff --git a/tls.c b/tls.c
+--- a/tls.c
++++ b/tls.c
+@@ -110,6 +110,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
  
-@@ -48,6 +49,7 @@ int read_only = 1;
- int list_only = 0;
- int preserve_perms = 0;
- 
-+static int display_atime = 0;
+ #endif
  
++static int display_atimes = 0;
++
  static void failed(char const *what, char const *where)
  {
-@@ -56,14 +58,29 @@ static void failed(char const *what, cha
+ 	fprintf(stderr, PROGRAM ": %s %s: %s\n",
+@@ -117,12 +119,37 @@ static void failed(char const *what, char const *where)
  	exit(1);
  }
  
-+static void storetime(char *dest, time_t t)
++static void storetime(char *dest, size_t destsize, time_t t, int nsecs)
 +{
 +	if (t) {
++		int len;
 +		struct tm *mt = gmtime(&t);
- 
-+		sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
++
++		len = snprintf(dest, destsize,
++			"%04d-%02d-%02d %02d:%02d:%02d",
 +			(int)mt->tm_year + 1900,
 +			(int)mt->tm_mon + 1,
 +			(int)mt->tm_mday,
 +			(int)mt->tm_hour,
 +			(int)mt->tm_min,
 +			(int)mt->tm_sec);
++		if (nsecs >= 0) {
++			snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs);
++		}
 +	} else {
-+		strcpy(dest, "                    ");
++		int has_nsecs = nsecs >= 0 ? 1 : 0;
++		int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
++		memset(datebuf, ' ', len);
++		datebuf[len] = '\0';
 +	}
-+}	
- 
++}
++
  static void list_file(const char *fname)
  {
  	STRUCT_STAT buf;
@@ -727,108 +601,84 @@ command before "make":
  	char linkbuf[4096];
  
  	if (do_lstat(fname, &buf) < 0)
-@@ -96,19 +113,8 @@ static void list_file(const char *fname)
+@@ -160,30 +187,17 @@ static void list_file(const char *fname)
+ 	}
  
  	permstring(permbuf, buf.st_mode);
- 
+-
 -	if (buf.st_mtime) {
+-		int len;
 -		mt = gmtime(&buf.st_mtime);
 -
--		sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
+-		len = snprintf(datebuf, sizeof datebuf,
+-			"%04d-%02d-%02d %02d:%02d:%02d",
 -			(int)mt->tm_year + 1900,
 -			(int)mt->tm_mon + 1,
 -			(int)mt->tm_mday,
 -			(int)mt->tm_hour,
 -			(int)mt->tm_min,
 -			(int)mt->tm_sec);
+ #ifdef ST_MTIME_NSEC
+-		if (nsec_times) {
+-			snprintf(datebuf + len, sizeof datebuf - len,
+-				".%09d", (int)buf.ST_MTIME_NSEC);
+-		}
++	if (nsec_times)
++		nsecs = (int)buf.ST_MTIME_NSEC
++	else
+ #endif
 -	} else {
--		strcpy(datebuf, "                   ");
+-		int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
+-		memset(datebuf, ' ', len);
+-		datebuf[len] = '\0';
 -	}
-+	storetime(mtimebuf, buf.st_mtime);
-+	storetime(atimebuf, buf.st_atime);
++		nsecs = -1;
++	storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);
++	if (display_atimes)
++		storetime(atimebuf, sizeof atimebuf, S_ISDIR(buf.st_mode) ? 0 : buf.st_atime, -1);
++	else
++		atimebuf[0] = '\0';
  
  	/* TODO: Perhaps escape special characters in fname? */
  
-@@ -119,24 +125,55 @@ static void list_file(const char *fname)
+@@ -194,13 +208,14 @@ static void list_file(const char *fname)
  		    (long)minor(buf.st_rdev));
- 	} else /* NB: use double for size since it might not fit in a long. */
- 		printf("%12.0f", (double)buf.st_size);
+ 	} else
+ 		printf("%15s", do_big_num(buf.st_size, 1, NULL));
 -	printf(" %6ld.%-6ld %6ld %s %s%s\n",
 +	printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
  	       (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
 -	       datebuf, fname, linkbuf);
-+ 	       mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
-+	       fname, linkbuf);
- }
- 
-+static struct poptOption long_options[] = {
-+  /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-+  {"atime",           'u', POPT_ARG_NONE,   &display_atime, 0,   0, 0},
-+  {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0},
-+  {0,0,0,0,0,0,0}
-+};
-+
-+static void tls_usage(int ret)
-+{
-+	fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
-+	    "Trivial file listing program for portably checking rsync\n");
-+	exit(ret);
-+}
- 
- int
- main(int argc, char *argv[])
- {
--	if (argc < 2) {
--		fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
--			"Trivial file listing program for portably checking rsync\n");
--		return 1;
-+	poptContext pc;
-+	const char **extra_args;
-+	int opt;
-+
-+	pc = poptGetContext(PROGRAM, argc, (const char **)argv,
-+			    long_options, 0);
-+	while ((opt = poptGetNextOpt(pc)) != -1) {
-+		switch (opt) {
-+		case 'h':
-+			tls_usage(0);
-+		default:
-+			fprintf(stderr,
-+			        "%s: %s\n",
-+				poptBadOption(pc, POPT_BADOPTION_NOALIAS),
-+				poptStrerror(opt));
-+			tls_usage(1);
-+		}
- 	}
- 
--	for (argv++; *argv; argv++) {
--		list_file(*argv);
--	}
-+	extra_args = poptGetArgs(pc);
-+	if (*extra_args == NULL)
-+		tls_usage(1);
-+
-+	for (; *extra_args; extra_args++)
-+		list_file(*extra_args);
-+	poptFreeContext(pc);
- 
- 	return 0;
++	       mtimebuf, atimebuf, fname, linkbuf);
  }
---- orig/util.c	2006-01-14 08:14:31
-+++ util.c	2006-01-14 08:20:29
-@@ -130,7 +130,7 @@ void overflow_exit(char *str)
- 
  
- 
--int set_modtime(char *fname, time_t modtime, mode_t mode)
-+int set_times(char *fname, time_t modtime, time_t atime, mode_t mode)
+ static struct poptOption long_options[] = {
+   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
++  {"atimes",          'U', POPT_ARG_NONE,   &display_atimes, 0, 0, 0},
+   {"link-times",      'l', POPT_ARG_NONE,   &link_times, 0, 0, 0 },
+   {"link-owner",      'L', POPT_ARG_NONE,   &link_owner, 0, 0, 0 },
+ #ifdef SUPPORT_XATTRS
+@@ -219,6 +234,7 @@ static void tls_usage(int ret)
+   fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
+   fprintf(F,"Trivial file listing program for portably checking rsync\n");
+   fprintf(F,"\nOptions:\n");
++  fprintf(F," -U, --atimes                display access (last-used) times\n");
+   fprintf(F," -l, --link-times            display the time on a symlink\n");
+   fprintf(F," -L, --link-owner            display the owner+group on a symlink\n");
+ #ifdef SUPPORT_XATTRS
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -127,20 +127,24 @@ NORETURN void overflow_exit(const char *str)
+ 
+ /* This returns 0 for success, 1 for a symlink if symlink time-setting
+  * is not possible, or -1 for any other error. */
+-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
++int set_times(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, mode_t mode)
  {
- #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
- 	if (S_ISLNK(mode))
-@@ -138,9 +138,13 @@ int set_modtime(char *fname, time_t modt
- #endif
+ 	static int switch_step = 0;
  
- 	if (verbose > 2) {
+ 	if (DEBUG_GTE(TIME, 1)) {
 -		rprintf(FINFO, "set modtime of %s to (%ld) %s",
 +		char mtimebuf[200];
 +
@@ -840,48 +690,33 @@ command before "make":
 +			mtimebuf, (long)atime, timestring(atime));
  	}
  
- 	if (dry_run)
-@@ -149,7 +153,7 @@ int set_modtime(char *fname, time_t modt
- 	{
+ 	switch (switch_step) {
+ #ifdef HAVE_UTIMENSAT
+ #include "case_N.h"
+-		if (do_utimensat(fname, modtime, mod_nsec) == 0)
++		if (do_utimensat(fname, modtime, mod_nsec, atime, 0) == 0)
+ 			break;
+ 		if (errno != ENOSYS)
+ 			return -1;
+@@ -150,7 +154,7 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
+ 
+ #ifdef HAVE_LUTIMES
+ #include "case_N.h"
+-		if (do_lutimes(fname, modtime, mod_nsec) == 0)
++		if (do_lutimes(fname, modtime, mod_nsec, atime, 0) == 0)
+ 			break;
+ 		if (errno != ENOSYS)
+ 			return -1;
+@@ -169,10 +173,10 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
+ 
+ #include "case_N.h"
  #ifdef HAVE_UTIMES
- 		struct timeval t[2];
--		t[0].tv_sec = time(NULL);
-+		t[0].tv_sec = atime;
- 		t[0].tv_usec = 0;
- 		t[1].tv_sec = modtime;
- 		t[1].tv_usec = 0;
-@@ -160,12 +164,12 @@ int set_modtime(char *fname, time_t modt
- 		return utimes(fname, t);
- #elif defined HAVE_UTIMBUF
- 		struct utimbuf tbuf;
--		tbuf.actime = time(NULL);
-+		tbuf.actime = atime;
- 		tbuf.modtime = modtime;
- 		return utime(fname,&tbuf);
- #elif defined HAVE_UTIME
- 		time_t t[2];
--		t[0] = time(NULL);
-+		t[0] = atime;
- 		t[1] = modtime;
- 		return utime(fname,t);
+-		if (do_utimes(fname, modtime, mod_nsec) == 0)
++		if (do_utimes(fname, modtime, mod_nsec, atime, 0) == 0)
+ 			break;
  #else
-@@ -1191,8 +1195,8 @@ int msleep(int t)
- 
- 
- /**
-- * Determine if two file modification times are equivalent (either
-- * exact or in the modification timestamp window established by
-+ * Determine if two file  times are equivalent (either
-+ * exact or in the timestamp window established by
-  * --modify-window).
-  *
-  * @retval 0 if the times should be treated as the same
-@@ -1201,7 +1205,7 @@ int msleep(int t)
-  *
-  * @retval -1 if the 2nd is later
-  **/
--int cmp_modtime(time_t file1, time_t file2)
-+int cmp_time(time_t file1, time_t file2)
- {
- 	if (file2 > file1) {
- 		if (file2 - file1 <= modify_window)
+-		if (do_utime(fname, modtime, mod_nsec) == 0)
++		if (do_utime(fname, modtime, mod_nsec, atime, 0) == 0)
+ 			break;
+ #endif
+