X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/85a65b825893593b6685064f30c83b57b496afc9..cc3e685d09b2095099fc396157d19172ab3ef7c4:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 721af1a..353a9e3 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -5,171 +5,193 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
+TODO:  need to fix this to handle 64-bit time_t values!
 
---- old/compat.c
-+++ new/compat.c
-@@ -62,6 +62,8 @@ void setup_protocol(int f_out,int f_in)
- 		preserve_uid = ++file_extra_cnt;
- 	if (preserve_gid)
- 		preserve_gid = ++file_extra_cnt;
-+	if (preserve_atimes)
-+		preserve_atimes = ++file_extra_cnt;
- 	if (preserve_acls && !am_sender)
- 		preserve_acls = ++file_extra_cnt;
- 
---- old/flist.c
-+++ new/flist.c
-@@ -48,6 +48,7 @@ extern int preserve_devices;
- extern int preserve_specials;
+diff --git a/compat.c b/compat.c
+--- a/compat.c
++++ b/compat.c
+@@ -44,6 +44,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;
+@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv;
+ #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;
+ 
+ #ifdef ICONV_OPTION
+ int filesfrom_convert = 0;
+@@ -124,6 +125,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;
+ 	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 uid_ndx;
+ extern int gid_ndx;
+ extern int eol_nulls;
++extern int atimes_ndx;
  extern int relative_paths;
  extern int implied_dirs;
  extern int file_extra_cnt;
-@@ -143,6 +144,7 @@ void show_flist_stats(void)
- static void list_file_entry(struct file_struct *f)
- {
- 	char permbuf[PERMSTRING_SIZE];
-+	time_t atime = preserve_atimes ? F_ATIME(f) : 0;
- 	double len;
- 
- 	if (!F_IS_ACTIVE(f)) {
-@@ -157,14 +159,16 @@ 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",
- 			permbuf, len, timestring(f->modtime),
-+			preserve_atimes ? timestring(atime) : "",
- 			f_name(f, NULL), F_SYMLINK(f));
- 	} else
- #endif
- 	{
--		rprintf(FINFO, "%s %11.0f %s %s\n",
-+		rprintf(FINFO, "%s %11.0f %s %s %s\n",
- 			permbuf, len, timestring(f->modtime),
-+			preserve_atimes ? timestring(atime) : "",
- 			f_name(f, NULL));
- 	}
- }
-@@ -348,6 +352,7 @@ int push_flist_dir(const char *dir, int 
- static void send_file_entry(int f, struct file_struct *file, int ndx)
+@@ -344,6 +345,7 @@ int push_pathname(const char *dir, int len)
+ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx)
  {
  	static time_t modtime;
 +	static time_t atime;
  	static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
-@@ -415,6 +420,13 @@ static void send_file_entry(int f, struc
- 		flags |= XMIT_SAME_TIME;
+@@ -450,6 +452,13 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
+ 		xflags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
-+	if (preserve_atimes && !S_ISDIR(mode)) {
++	if (atimes_ndx && !S_ISDIR(mode)) {
 +		time_t file_atime = F_ATIME(file);
 +		if (file_atime == atime)
-+			flags |= XMIT_SAME_ATIME;
++			xflags |= XMIT_SAME_ATIME;
 +		else
 +			atime = file_atime;
 +	}
  
  #ifdef SUPPORT_HARD_LINKS
  	if (tmp_dev != 0) {
-@@ -482,6 +494,8 @@ static void send_file_entry(int f, struc
- 		write_int(f, modtime);
- 	if (!(flags & XMIT_SAME_MODE))
+@@ -523,6 +532,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
+ 	}
+ 	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)) {
- 		write_abbrevint30(f, uid);
- 		if (flags & XMIT_USER_NAME_FOLLOWS) {
-@@ -558,7 +572,7 @@ static void send_file_entry(int f, struc
++	if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
++		write_varlong(f, atime, 4);
+ 	if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
+ 		if (protocol_version < 30)
+ 			write_int(f, uid);
+@@ -609,7 +620,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
  static struct file_struct *recv_file_entry(struct file_list *flist,
- 					   int flags, int f)
+ 					   int xflags, int f)
  {
--	static time_t modtime;
-+	static time_t modtime, atime;
+-	static int64 modtime;
++	static int64 modtime, atime;
  	static mode_t mode;
+ #ifdef SUPPORT_HARD_LINKS
  	static int64 dev;
- 	static dev_t rdev;
-@@ -655,6 +669,8 @@ static struct file_struct *recv_file_ent
- 		modtime = (time_t)read_int(f);
- 	if (!(flags & XMIT_SAME_MODE))
+@@ -742,6 +753,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+ 	}
+ 	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 (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
++		atime = read_varlong(f, 4);
++#if SIZEOF_TIME_T < SIZEOF_INT64
++		if ((atime > INT_MAX || atime < INT_MIN) && !am_generator) {
++			rprintf(FERROR_XFER,
++				"Access time value of %s truncated on receiver.\n",
++				lastname);
++		}
++#endif
++	}
  
  	if (chmod_modes && !S_ISLNK(mode))
  		mode = tweak_mode(mode, chmod_modes);
-@@ -769,6 +785,8 @@ static struct file_struct *recv_file_ent
- 		F_OWNER(file) = uid;
- 	if (preserve_gid)
+@@ -872,6 +893,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
  		F_GROUP(file) = gid;
-+	if (preserve_atimes)
-+		F_ATIME(file) = atime;
+ 		file->flags |= gid_flags;
+ 	}
++	if (atimes_ndx)
++		F_ATIME(file) = (uint32)atime;
+ 	if (unsort_ndx)
+ 		F_NDX(file) = flist->used + flist->ndx_start;
  
- 	if (basename != thisname) {
- 		file->dirname = lastdir;
-@@ -1074,6 +1092,8 @@ struct file_struct *make_file(const char
+@@ -1200,6 +1223,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
  		F_OWNER(file) = st.st_uid;
- 	if (preserve_gid)
+ 	if (gid_ndx)
  		F_GROUP(file) = st.st_gid;
-+	if (preserve_atimes)
-+		F_ATIME(file) = st.st_atime;
++	if (atimes_ndx)
++		F_ATIME(file) = (uint32)st.st_atime;
  
  	if (basename != thisname)
  		file->dirname = lastdir;
---- old/generator.c
-+++ new/generator.c
-@@ -44,6 +44,7 @@ extern int preserve_perms;
- extern int preserve_uid;
- extern int preserve_gid;
+diff --git a/generator.c b/generator.c
+--- a/generator.c
++++ b/generator.c
+@@ -43,6 +43,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
  extern int preserve_times;
 +extern int preserve_atimes;
- extern int omit_dir_times;
+ extern int uid_ndx;
+ extern int gid_ndx;
  extern int delete_mode;
- extern int delete_before;
-@@ -552,6 +553,9 @@ void itemize(const char *fname, struct f
+@@ -568,6 +569,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
  		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
  		 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
  			iflags |= ITEM_REPORT_TIME;
 +		if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
 +		 && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
 +			iflags |= ITEM_REPORT_ATIME;
- 		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
- 			iflags |= ITEM_REPORT_PERMS;
- 		if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
-@@ -852,6 +856,8 @@ static int try_dests_reg(struct file_str
+ #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
+ 		if (S_ISLNK(file->mode)) {
+ 			;
+@@ -923,6 +927,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 (preserve_atimes)
-+				set_file_attrs(fname, file, sxp, 0);
++				set_file_attrs(fname, file, sxp, NULL, 0);
  			if (preserve_hard_links && F_IS_HLINKED(file))
- 				finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
+ 				finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
  			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
-@@ -1700,7 +1706,7 @@ static void touch_up_dirs(struct file_li
+@@ -1113,6 +1119,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;
+ 	double len;
+ 
+ 	if (!F_IS_ACTIVE(f)) {
+@@ -1127,14 +1134,16 @@ static void list_file_entry(struct file_struct *f)
+ 
+ #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",
+ 			permbuf, len, timestring(f->modtime),
++			atimes_ndx ? timestring(atime) : "",
+ 			f_name(f, NULL), F_SYMLINK(f));
+ 	} else
+ #endif
+ 	{
+-		rprintf(FINFO, "%s %11.0f %s %s\n",
++		rprintf(FINFO, "%s %11.0f %s %s %s\n",
+ 			permbuf, len, timestring(f->modtime),
++			atimes_ndx ? timestring(atime) : "",
+ 			f_name(f, NULL));
+ 	}
+ }
+@@ -1884,7 +1893,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
  		if (!(file->mode & S_IWUSR))
  			do_chmod(fname, file->mode);
  		if (need_retouch_dir_times)
 -			set_modtime(fname, file->modtime, file->mode);
 +			set_times(fname, file->modtime, file->modtime, file->mode);
- 		if (allowed_lull && !(++j % lull_mod))
+ 		if (allowed_lull && !(counter % lull_mod))
  			maybe_send_keepalive();
- 		else if (!(j % 200))
---- old/log.c
-+++ new/log.c
-@@ -36,6 +36,7 @@ extern int msg_fd_out;
- extern int allow_8bit_chars;
- extern int protocol_version;
- extern int preserve_times;
-+extern int preserve_atimes;
- extern int preserve_uid;
- extern int preserve_gid;
- extern int stdout_format_has_i;
-@@ -624,7 +625,8 @@ static void log_formatted(enum logcode c
+ 		else if (!(counter & 0xFF))
+diff --git a/log.c b/log.c
+--- a/log.c
++++ b/log.c
+@@ -642,7 +642,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';
@@ -179,39 +201,36 @@ To use this patch, run these commands for a successful build:
  			c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
  			c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
  			c[11] = '\0';
---- old/options.c
-+++ new/options.c
-@@ -55,6 +55,7 @@ int preserve_uid = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -57,6 +57,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;
-@@ -315,8 +316,9 @@ void usage(enum logcode F)
-   rprintf(F,"     --devices               preserve device files (super-user only)\n");
-   rprintf(F,"     --specials              preserve special files\n");
+@@ -347,6 +348,7 @@ void usage(enum logcode F)
    rprintf(F," -D                          same as --devices --specials\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," -U, --atimes                preserve access (use) times\n");
+   rprintf(F," -t, --times                 preserve modification times\n");
+   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
++  rprintf(F," -U, --atimes                preserve access (last-used) times\n");
    rprintf(F,"     --super                 receiver attempts super-user activities\n");
-   rprintf(F," -S, --sparse                handle sparse files efficiently\n");
-   rprintf(F," -n, --dry-run               show what would have been transferred\n");
-@@ -436,6 +438,9 @@ static struct poptOption long_options[] 
-   {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
+ #ifdef SUPPORT_XATTRS
+   rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
+@@ -482,6 +484,9 @@ static struct poptOption long_options[] = {
+   {"times",           't', POPT_ARG_VAL,    &preserve_times, 2, 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",          'U', POPT_ARG_VAL,    &preserve_atimes, 1, 0, 0 },
 +  {"no-atimes",        0,  POPT_ARG_VAL,    &preserve_atimes, 0, 0, 0 },
 +  {"no-U",             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 },
-   {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
-@@ -1577,6 +1582,8 @@ void server_options(char **args,int *arg
+   {"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 },
+@@ -1716,6 +1721,8 @@ void server_options(char **args, int *argc_p)
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -220,31 +239,32 @@ To use this patch, run these commands for a successful build:
  	if (preserve_perms)
  		argstr[x++] = 'p';
  	else if (preserve_executability && am_sender)
---- old/rsync.c
-+++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int dry_run;
- extern int preserve_acls;
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -33,6 +33,7 @@ extern int preserve_acls;
+ extern int preserve_xattrs;
  extern int preserve_perms;
  extern int preserve_executability;
 +extern int preserve_atimes;
  extern int preserve_times;
- extern int omit_dir_times;
  extern int am_root;
-@@ -234,6 +235,7 @@ int set_file_attrs(char *fname, struct f
+ extern int am_server;
+@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
  	int updated = 0;
- 	statx sx2;
+ 	stat_x sx2;
  	int change_uid, change_gid;
 +	time_t atime, mtime;
  	mode_t new_mode = file->mode;
+ 	int inherit;
  
- 	if (!sxp) {
-@@ -261,18 +263,36 @@ int set_file_attrs(char *fname, struct f
- 		get_acl(fname, sxp);
+@@ -386,18 +388,36 @@ 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 || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
+ 	if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
  		flags |= ATTRS_SKIP_MTIME;
 +	if (!preserve_atimes || S_ISDIR(sxp->st.st_mode))
 +		flags |= ATTRS_SKIP_ATIME;
@@ -267,7 +287,7 @@ To use this patch, run these commands for a successful build:
 +	if (updated) {
 +		int ret = set_times(fname, mtime, 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));
  			goto cleanup;
  		}
@@ -277,18 +297,19 @@ To use this patch, run these commands for a successful build:
 +			updated = 0;
  	}
  
- 	change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
---- old/rsync.h
-+++ new/rsync.h
-@@ -56,6 +56,7 @@
- #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
- #define XMIT_USER_NAME_FOLLOWS (1<<12)	/* protocols >= 30 */
- #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */
-+#define XMIT_SAME_ATIME (1<<14)		/* protocols >= 30 */
+ 	change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
+diff --git a/rsync.h b/rsync.h
+--- a/rsync.h
++++ b/rsync.h
+@@ -60,6 +60,7 @@
+ #define XMIT_RDEV_MINOR_8_pre30 (1<<11)	/* protocols 28 - 29  */
+ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
+ #define XMIT_HLINK_FIRST (1<<12)	/* protocols 30 - now (HLINKED files only) */
++#define XMIT_SAME_ATIME (1<<13)		/* protocols ?? - now */
  
  /* These flags are used in the live flist data. */
  
-@@ -136,6 +137,7 @@
+@@ -148,6 +149,7 @@
  
  #define ATTRS_REPORT		(1<<0)
  #define ATTRS_SKIP_MTIME	(1<<1)
@@ -296,37 +317,34 @@ To use this patch, run these commands for a successful build:
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -571,6 +573,7 @@ extern int file_extra_cnt;
- extern int preserve_uid;
- extern int preserve_gid;
- extern int preserve_acls;
-+extern int preserve_atimes;
- 
- #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
- #define EXTRA_LEN (sizeof (union file_extras))
-@@ -603,6 +606,7 @@ extern int preserve_acls;
+@@ -618,6 +620,7 @@ 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;
+ 
+@@ -655,6 +658,7 @@ extern int xattrs_ndx;
  /* When the associated option is on, all entries will have these present: */
- #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
- #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
-+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
- #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->unum
- 
- /* These items are per-entry optional and mutally exclusive: */
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -329,8 +329,9 @@ to the detailed description below for a 
-      --devices               preserve device files (super-user only)
-      --specials              preserve special files
+ #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
+ #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
++#define F_ATIME(f) REQ_EXTRA(f, atimes_ndx)->unum
+ #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
+ #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
+ #define F_NDX(f) REQ_EXTRA(f, unsort_ndx)->num
+diff --git a/rsync.yo b/rsync.yo
+--- a/rsync.yo
++++ b/rsync.yo
+@@ -349,6 +349,7 @@ to the detailed description below for a complete description.  verb(
   -D                          same as --devices --specials
-- -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
+  -t, --times                 preserve modification times
+  -O, --omit-dir-times        omit directories from --times
 + -U, --atimes                preserve access (use) times
       --super                 receiver attempts super-user activities
+      --fake-super            store/recover privileged attrs using xattrs
   -S, --sparse                handle sparse files efficiently
-  -n, --dry-run               show what would have been transferred
-@@ -896,6 +897,12 @@ it is preserving modification times (see
+@@ -974,6 +975,12 @@ 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).
  This option is inferred if you use bf(--backup) without bf(--backup-dir).
  
@@ -339,16 +357,7 @@ To use this patch, run these commands for a successful build:
  dit(bf(--super)) This tells the receiving side to attempt super-user
  activities even if the receiving rsync wasn't run by the super-user.  These
  activities include: preserving users via the bf(--owner) option, preserving
-@@ -1482,7 +1489,7 @@ quote(itemization(
-   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(p) means the permissions are different and are being updated to
-@@ -1491,8 +1498,10 @@ quote(itemization(
+@@ -1671,8 +1678,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).
@@ -361,18 +370,21 @@ To use this patch, run these commands for a successful build:
    it() The bf(a) means that the ACL information changed.
    it() The bf(x) slot is reserved for reporting extended attribute changes
    (a feature that is not yet released).
---- old/sender.c
-+++ new/sender.c
-@@ -41,6 +41,7 @@ extern int do_progress;
+diff --git a/sender.c b/sender.c
+--- a/sender.c
++++ b/sender.c
+@@ -43,6 +43,7 @@ extern int do_progress;
  extern int inplace;
  extern int batch_fd;
  extern int write_batch;
 +extern unsigned int file_struct_len;
  extern struct stats stats;
- extern struct file_list *cur_flist, *first_flist;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
  
---- old/testsuite/atimes.test
-+++ new/testsuite/atimes.test
+diff --git a/testsuite/atimes.test b/testsuite/atimes.test
+new file mode 100644
+--- /dev/null
++++ b/testsuite/atimes.test
 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +
@@ -393,18 +405,10 @@ To use this patch, run these commands for a successful build:
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
---- old/testsuite/rsync.fns
-+++ new/testsuite/rsync.fns
-@@ -66,7 +66,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
- }
- 
- check_perms() {
-@@ -184,6 +184,10 @@ checkit() {
+diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
+--- a/testsuite/rsync.fns
++++ b/testsuite/rsync.fns
+@@ -187,6 +187,10 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
@@ -415,7 +419,7 @@ To use this patch, run these commands for a successful build:
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -191,10 +195,13 @@ checkit() {
+@@ -194,10 +198,13 @@ checkit() {
  	failed="YES";
      fi
  
@@ -430,26 +434,19 @@ To use this patch, run these commands for a successful build:
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  
---- old/tls.c
-+++ new/tls.c
-@@ -34,6 +34,7 @@
-  * change. */
- 
- #include "rsync.h"
-+#include "popt.h"
+diff --git a/tls.c b/tls.c
+--- a/tls.c
++++ b/tls.c
+@@ -104,6 +104,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)
  
- #define PROGRAM "tls"
- 
-@@ -43,6 +44,8 @@ int read_only = 1;
- int list_only = 0;
- int preserve_perms = 0;
+ #endif
  
 +static int display_atime = 0;
 + 
  static void failed(char const *what, char const *where)
  {
  	fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -50,12 +53,29 @@ static void failed(char const *what, cha
+@@ -111,12 +113,29 @@ static void failed(char const *what, char const *where)
  	exit(1);
  }
  
@@ -481,7 +478,7 @@ To use this patch, run these commands for a successful build:
  	char linkbuf[4096];
  
  	if (do_lstat(fname, &buf) < 0)
-@@ -88,19 +108,8 @@ static void list_file(const char *fname)
+@@ -153,19 +172,8 @@ static void list_file(const char *fname)
  
  	permstring(permbuf, buf.st_mode);
  
@@ -503,7 +500,7 @@ To use this patch, run these commands for a successful build:
  
  	/* TODO: Perhaps escape special characters in fname? */
  
-@@ -111,23 +120,55 @@ static void list_file(const char *fname)
+@@ -176,13 +184,15 @@ 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);
@@ -511,66 +508,28 @@ To use this patch, run these commands for a successful build:
 +	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 : "",
++	       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] FILE ...\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 " FILE ...\n"
--			"Trivial file listing program for portably checking rsync\n");
--		return 1;
--	}
-+	poptContext pc;
-+	const char **extra_args;
-+	int opt;
- 
--	for (argv++; *argv; argv++) {
--		list_file(*argv);
-+	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);
-+		}
- 	}
- 
-+	extra_args = poptGetArgs(pc);
-+	if (*extra_args == NULL)
-+		tls_usage(1);
-+
-+	for (; *extra_args; extra_args++)
-+		list_file(*extra_args);
-+	poptFreeContext(pc);
-+
- 	return 0;
- }
---- old/util.c
-+++ new/util.c
-@@ -120,7 +120,7 @@ NORETURN void overflow_exit(const char *
+ static struct poptOption long_options[] = {
+   /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
++  {"atime",           'u', POPT_ARG_NONE,   &display_atime, 0, 0, 0},
+ #ifdef SUPPORT_XATTRS
+   {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
+ #endif
+@@ -196,6 +206,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");
++  rprintf(F," -U, --atimes                display access (last-used) times\n");
+ #ifdef SUPPORT_XATTRS
+   fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
+ #endif
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -122,7 +122,7 @@ NORETURN void overflow_exit(const char *str)
  	exit_cleanup(RERR_MALLOC);
  }
  
@@ -579,7 +538,7 @@ To use this patch, run these commands for a successful build:
  {
  #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
  	if (S_ISLNK(mode))
-@@ -128,9 +128,13 @@ int set_modtime(const char *fname, time_
+@@ -130,9 +130,13 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
  #endif
  
  	if (verbose > 2) {
@@ -595,7 +554,7 @@ To use this patch, run these commands for a successful build:
  	}
  
  	if (dry_run)
-@@ -139,7 +143,7 @@ int set_modtime(const char *fname, time_
+@@ -141,7 +145,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
  	{
  #ifdef HAVE_UTIMES
  		struct timeval t[2];
@@ -604,9 +563,9 @@ To use this patch, run these commands for a successful build:
  		t[0].tv_usec = 0;
  		t[1].tv_sec = modtime;
  		t[1].tv_usec = 0;
-@@ -152,12 +156,12 @@ int set_modtime(const char *fname, time_
+@@ -154,12 +158,12 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
  		return utimes(fname, t);
- #elif defined HAVE_UTIMBUF
+ #elif defined HAVE_STRUCT_UTIMBUF
  		struct utimbuf tbuf;
 -		tbuf.actime = time(NULL);
 +		tbuf.actime = atime;