X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/672ad041a6cb01a0fd3f911e51bec9df65159e2f..048d2a08adf5b8d8e066ab6c0c8be30ccfb1c0e3:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 54265a6..59b49a2 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -5,69 +5,70 @@ 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
+@@ -64,6 +64,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;
+ 	if (preserve_xattrs)
 --- old/flist.c
 +++ new/flist.c
-@@ -46,6 +46,7 @@ extern int preserve_devices;
+@@ -51,6 +51,7 @@ extern int preserve_devices;
  extern int preserve_specials;
  extern int preserve_uid;
  extern int preserve_gid;
 +extern int preserve_atimes;
  extern int relative_paths;
  extern int implied_dirs;
- extern int ignore_perishable;
-@@ -127,6 +128,7 @@ void show_flist_stats(void)
+ extern int file_extra_cnt;
+@@ -148,6 +149,7 @@ void show_flist_stats(void)
  static void list_file_entry(struct file_struct *f)
  {
  	char permbuf[PERMSTRING_SIZE];
-+	time_t atime = preserve_atimes ? IVAL(ATIME_PTR(f), 0) : 0;
++	time_t atime = preserve_atimes ? F_ATIME(f) : 0;
+ 	double len;
  
- 	if (!f->basename) {
- 		/* this can happen if duplicate names were removed */
-@@ -137,16 +139,18 @@ static void list_file_entry(struct file_
+ 	if (!F_IS_ACTIVE(f)) {
+@@ -162,14 +164,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,
- 			(double)f->length, timestring(f->modtime),
+ 			permbuf, len, timestring(f->modtime),
 +			preserve_atimes ? timestring(atime) : "",
- 			f_name(f, NULL), f->u.link);
+ 			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,
- 			(double)f->length, timestring(f->modtime),
+ 			permbuf, len, timestring(f->modtime),
 +			preserve_atimes ? timestring(atime) : "",
  			f_name(f, NULL));
  	}
  }
-@@ -304,6 +308,7 @@ static void send_file_entry(struct file_
+@@ -353,6 +357,7 @@ int push_flist_dir(const char *dir, int 
+ static void send_file_entry(int f, struct file_struct *file, int ndx)
  {
- 	unsigned short flags;
  	static time_t modtime;
 +	static time_t atime;
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -319,7 +324,7 @@ static void send_file_entry(struct file_
- 
- 	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;
-@@ -365,6 +370,13 @@ static void send_file_entry(struct file_
+@@ -420,6 +425,13 @@ static void send_file_entry(int f, struc
  		flags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
 +	if (preserve_atimes && !S_ISDIR(mode)) {
-+		time_t file_atime = IVAL(ATIME_PTR(file), 0);
++		time_t file_atime = F_ATIME(file);
 +		if (file_atime == atime)
 +			flags |= XMIT_SAME_ATIME;
 +		else
@@ -75,127 +76,63 @@ To use this patch, run these commands for a successful build:
 +	}
  
  #ifdef SUPPORT_HARD_LINKS
- 	if (file->link_u.idev) {
-@@ -418,6 +430,8 @@ static void send_file_entry(struct file_
- 		write_int(f, modtime);
+ 	if (tmp_dev != 0) {
+@@ -491,6 +503,8 @@ static void send_file_entry(int f, struc
+ 	}
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
 +	if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
-+		write_int(f, atime);
++		write_varlong(f, atime, 4);
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
- 		if (!numeric_ids)
- 			add_uid(uid);
-@@ -484,6 +498,7 @@ static struct file_struct *receive_file_
- 					      unsigned short flags, int f)
+ 		if (protocol_version < 30)
+ 			write_int(f, uid);
+@@ -577,7 +591,7 @@ static void send_file_entry(int f, struc
+ static struct file_struct *recv_file_entry(struct file_list *flist,
+ 					   int flags, int f)
  {
- 	static time_t modtime;
-+	static time_t atime;
+-	static int64 modtime;
++	static int64 modtime, atime;
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -497,12 +512,13 @@ static struct file_struct *receive_file_
- 	char thisname[MAXPATHLEN];
- 	unsigned int l1 = 0, l2 = 0;
- 	int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
-+	int atime_len;
- 	OFF_T file_length;
- 	char *basename, *dirname, *bp;
- 	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;
-@@ -558,6 +574,8 @@ static struct file_struct *receive_file_
- 		modtime = (time_t)read_int(f);
+@@ -686,6 +700,16 @@ static struct file_struct *recv_file_ent
+ 	}
  	if (!(flags & 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_atimes && !S_ISDIR(mode) && !(flags & 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,
++				"Access time value of %s truncated on receiver.\n",
++				lastname);
++		}
++#endif
++	}
  
  	if (chmod_modes && !S_ISLNK(mode))
  		mode = tweak_mode(mode, chmod_modes);
-@@ -600,19 +618,23 @@ static struct file_struct *receive_file_
- 
- 	sum_len = always_checksum && S_ISREG(mode) ? MD4_SUM_LENGTH : 0;
- 
-+	atime_len = preserve_atimes ? 4 : 0;
-+
- 	alloc_len = file_struct_len + dirname_len + basename_len
--		  + linkname_len + sum_len;
-+		  + atime_len + linkname_len + sum_len;
- 	bp = pool_alloc(flist->file_pool, alloc_len, "receive_file_entry");
- 
- 	file = (struct file_struct *)bp;
- 	memset(bp, 0, file_struct_len);
--	bp += file_struct_len;
-+	bp += file_struct_len + atime_len;
- 
- 	file->modtime = modtime;
- 	file->length = file_length;
- 	file->mode = mode;
- 	file->uid = uid;
- 	file->gid = gid;
+@@ -810,6 +834,8 @@ static struct file_struct *recv_file_ent
+ 		F_OWNER(file) = uid;
+ 	if (preserve_gid)
+ 		F_GROUP(file) = gid;
 +	if (preserve_atimes)
-+		SIVAL(ATIME_PTR(file), 0, atime);
- 
- 	if (dirname_len) {
- 		file->dirname = lastdir = bp;
-@@ -731,6 +753,7 @@ struct file_struct *make_file(char *fnam
- 	char thisname[MAXPATHLEN];
- 	char linkname[MAXPATHLEN];
- 	int alloc_len, basename_len, dirname_len, linkname_len, sum_len;
-+	int atime_len;
- 	char *basename, *dirname, *bp;
- 
- 	if (!flist || !flist->count)	/* Ignore lastdir when invalid. */
-@@ -854,8 +877,10 @@ struct file_struct *make_file(char *fnam
- 	sum_len = always_checksum && am_sender && S_ISREG(st.st_mode)
- 	        ? MD4_SUM_LENGTH : 0;
- 
-+	atime_len = preserve_atimes ? 4 : 0;
-+
- 	alloc_len = file_struct_len + dirname_len + basename_len
--		  + linkname_len + sum_len;
-+		  + atime_len + linkname_len + sum_len;
- 	if (flist)
- 		bp = pool_alloc(flist->file_pool, alloc_len, "make_file");
- 	else {
-@@ -865,7 +890,7 @@ struct file_struct *make_file(char *fnam
- 
- 	file = (struct file_struct *)bp;
- 	memset(bp, 0, file_struct_len);
--	bp += file_struct_len;
-+	bp += file_struct_len + atime_len;
- 
- 	file->flags = flags;
- 	file->modtime = st.st_mtime;
-@@ -873,6 +898,8 @@ struct file_struct *make_file(char *fnam
- 	file->mode = st.st_mode;
- 	file->uid = st.st_uid;
- 	file->gid = st.st_gid;
++		F_ATIME(file) = (time_t)atime;
+ 
+ 	if (basename != thisname) {
+ 		file->dirname = lastdir;
+@@ -1119,6 +1145,8 @@ struct file_struct *make_file(const char
+ 		F_OWNER(file) = st.st_uid;
+ 	if (preserve_gid)
+ 		F_GROUP(file) = st.st_gid;
 +	if (preserve_atimes)
-+		SIVAL(ATIME_PTR(file), 0, st.st_atime);
- 
- #ifdef SUPPORT_HARD_LINKS
- 	if (flist && flist->hlink_pool) {
-@@ -1595,8 +1622,9 @@ static void clean_flist(struct file_list
- 			}
- 			/* Make sure we don't lose track of a user-specified
- 			 * top directory. */
--			flist->files[keep]->flags |= flist->files[drop]->flags
--						   & (FLAG_TOP_DIR|FLAG_DEL_HERE);
-+			flist->files[keep]->flags
-+			    |= flist->files[drop]->flags
-+			     & (FLAG_TOP_DIR|FLAG_DEL_HERE);
- 
- 			clear_file(flist->files[drop], flist);
++		F_ATIME(file) = st.st_atime;
  
+ 	if (basename != thisname)
+ 		file->dirname = lastdir;
 --- old/generator.c
 +++ new/generator.c
-@@ -43,6 +43,7 @@ extern int preserve_perms;
+@@ -45,6 +45,7 @@ extern int preserve_perms;
  extern int preserve_uid;
  extern int preserve_gid;
  extern int preserve_times;
@@ -203,56 +140,57 @@ To use this patch, run these commands for a successful build:
  extern int omit_dir_times;
  extern int delete_mode;
  extern int delete_before;
-@@ -90,6 +91,7 @@ extern dev_t filesystem_dev;
- extern char *backup_dir;
- extern char *backup_suffix;
- extern int backup_suffix_len;
-+extern unsigned int file_struct_len;
- extern struct file_list *the_file_list;
- extern struct filter_list_struct server_filter_list;
- 
-@@ -409,6 +411,9 @@ void itemize(struct file_struct *file, i
+@@ -561,6 +562,9 @@ void itemize(const char *fnamecmp, struc
  		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- 		 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ 		 || (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(IVAL(ATIME_PTR(file), 0), st->st_atime) != 0)
++		 && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
 +			iflags |= ITEM_REPORT_ATIME;
- 		if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
+ 		if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
  			iflags |= ITEM_REPORT_PERMS;
- 		if (preserve_uid && am_root && file->uid != st->st_uid)
-@@ -720,6 +725,8 @@ static int try_dests_reg(struct file_str
- 			if (hard_link_one(file, ndx, fname, 0, stp,
- 					  cmpbuf, 1, i, code) < 0)
+ 		if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid)
+@@ -878,6 +882,8 @@ static int try_dests_reg(struct file_str
+ 		if (link_dest) {
+ 			if (!hard_link_one(file, fname, cmpbuf, 1))
  				goto try_a_copy;
 +			if (preserve_atimes)
-+				set_file_attrs(fname, file, stp, 0);
- 			if (preserve_hard_links && file->link_u.links) {
- 				if (dry_run)
- 					file->link_u.links->link_dest_used = j + 1;
++				set_file_attrs(fname, file, sxp, 0);
+ 			if (preserve_hard_links && F_IS_HLINKED(file))
+ 				finish_hard_link(file, fname, &sxp->st, itemizing, code, j);
+ 			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+@@ -1741,7 +1747,7 @@ static void touch_up_dirs(struct file_li
+ 		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))
+ 			maybe_send_keepalive();
+ 		else if (!(j % 200))
 --- old/log.c
 +++ new/log.c
-@@ -37,6 +37,7 @@ extern int msg_fd_out;
+@@ -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;
- extern int stdout_format_has_o_or_i;
- extern int logfile_format_has_i;
-@@ -606,7 +607,8 @@ static void log_formatted(enum logcode c
- 			n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
- 			n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
- 			n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
--			n[8] = '.';
-+			n[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
+@@ -624,7 +625,8 @@ static void log_formatted(enum logcode c
+ 			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';
- 			n[9] = '\0';
- 
- 			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
+ 			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;
+@@ -56,6 +56,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
  int omit_dir_times = 0;
@@ -260,7 +198,7 @@ To use this patch, run these commands for a successful build:
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -311,8 +312,9 @@ void usage(enum logcode F)
+@@ -323,8 +324,9 @@ void usage(enum logcode F)
    rprintf(F,"     --devices               preserve device files (super-user only)\n");
    rprintf(F,"     --specials              preserve special files\n");
    rprintf(F," -D                          same as --devices --specials\n");
@@ -272,17 +210,17 @@ To use this patch, run these commands for a successful build:
    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");
-@@ -428,6 +430,9 @@ static struct poptOption long_options[] 
+@@ -451,6 +453,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",          'U', POPT_ARG_VAL,    &preserve_atimes, 1, 0, 0 },
 +  {"no-atimes",        0,  POPT_ARG_VAL,    &preserve_atimes, 0, 0, 0 },
-+  {"no-k",             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 },
-@@ -1538,6 +1543,8 @@ void server_options(char **args,int *arg
+@@ -1603,6 +1608,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -293,62 +231,54 @@ To use this patch, run these commands for a successful build:
  	else if (preserve_executability && am_sender)
 --- old/rsync.c
 +++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int verbose;
- extern int dry_run;
+@@ -35,6 +35,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;
-@@ -49,6 +50,7 @@ extern int keep_dirlinks;
- extern int make_backups;
- extern mode_t orig_umask;
- extern struct stats stats;
-+extern unsigned int file_struct_len;
- extern struct chmod_mode_struct *daemon_chmod_modes;
- 
- #if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
-@@ -129,6 +131,7 @@ int set_file_attrs(char *fname, struct f
+@@ -224,6 +225,7 @@ int set_file_attrs(const char *fname, st
  	int updated = 0;
- 	STRUCT_STAT st2;
+ 	statx sx2;
  	int change_uid, change_gid;
 +	time_t atime, mtime;
  	mode_t new_mode = file->mode;
  
- 	if (!st) {
-@@ -148,18 +151,36 @@ int set_file_attrs(char *fname, struct f
- 		}
- 	}
+ 	if (!sxp) {
+@@ -259,18 +261,36 @@ int set_file_attrs(const char *fname, st
+ 		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(st->st_mode) && omit_dir_times))
+ 	if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
  		flags |= ATTRS_SKIP_MTIME;
-+	if (!preserve_atimes || S_ISDIR(st->st_mode))
++	if (!preserve_atimes || S_ISDIR(sxp->st.st_mode))
 +		flags |= ATTRS_SKIP_ATIME;
  	if (!(flags & ATTRS_SKIP_MTIME)
- 	    && cmp_time(st->st_mtime, file->modtime) != 0) {
--		int ret = set_modtime(fname, file->modtime, st->st_mode);
+ 	    && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+-		int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
 +		mtime = file->modtime;
 +		updated = 1;
 +	} else
-+		mtime = st->st_mtime;
++		mtime = sxp->st.st_mtime;
 +	if (!(flags & ATTRS_SKIP_ATIME)) {
-+		time_t file_atime = IVAL(ATIME_PTR(file), 0);
-+		if (cmp_time(st->st_atime, file_atime) != 0) {
++		time_t file_atime = F_ATIME(file);
++		if (cmp_time(sxp->st.st_atime, file_atime) != 0) {
 +			atime = file_atime;
 +			updated = 1;
 +		} else
-+			atime = st->st_atime;
++			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, atime, sxp->st.st_mode);
  		if (ret < 0) {
  			rsyserr(FERROR, 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;
@@ -356,18 +286,18 @@ To use this patch, run these commands for a successful build:
 +			updated = 0;
  	}
  
- 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
+ 	change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
 --- old/rsync.h
 +++ new/rsync.h
-@@ -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)
+@@ -56,6 +56,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 */
++#define XMIT_SAME_ATIME (1<<13)		/* protocols ?? - NOW */
  
  /* These flags are used in the live flist data. */
  
-@@ -120,6 +121,7 @@
+@@ -136,6 +137,7 @@
  
  #define ATTRS_REPORT		(1<<0)
  #define ATTRS_SKIP_MTIME	(1<<1)
@@ -375,18 +305,25 @@ To use this patch, run these commands for a successful build:
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -534,6 +536,8 @@ struct file_struct {
- 	uchar flags;	/* this item MUST remain last */
- };
+@@ -568,6 +570,7 @@ struct file_struct {
+ extern int file_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_atimes;
+ extern int preserve_acls;
+ extern int preserve_xattrs;
+ 
+@@ -602,6 +605,7 @@ extern int preserve_xattrs;
+ /* 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)->num
+ #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
  
-+#define ATIME_PTR(f) (((uchar*)(f))+file_struct_len)
-+
- /*
-  * Start the flist array at FLIST_START entries and grow it
-  * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
 --- old/rsync.yo
 +++ new/rsync.yo
-@@ -328,8 +328,9 @@ to the detailed description below for a 
+@@ -330,8 +330,9 @@ to the detailed description below for a 
       --devices               preserve device files (super-user only)
       --specials              preserve special files
   -D                          same as --devices --specials
@@ -398,7 +335,7 @@ To use this patch, run these commands for a successful build:
       --super                 receiver attempts super-user activities
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
-@@ -869,6 +870,12 @@ it is preserving modification times (see
+@@ -908,6 +909,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).
  
@@ -411,16 +348,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
-@@ -1396,7 +1403,7 @@ with older versions of rsync, but that a
- verbose messages).
- 
- The "%i" escape has a cryptic output that is 9 letters long.  The general
--format is like the string bf(YXcstpogz), where bf(Y) is replaced by the
-+format is like the string bf(YXcstpogu), where bf(Y) is replaced by the
- type 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.
-@@ -1436,7 +1443,7 @@ quote(itemization(
+@@ -1494,7 +1501,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)
@@ -429,28 +357,29 @@ To use this patch, run these commands for a successful build:
    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
-@@ -1445,7 +1452,10 @@ quote(itemization(
+@@ -1503,8 +1510,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(z) slot is reserved for future use.
+-  it() The bf(u) slot is reserved for reporting update (access) time changes
+-  (a feature that is not yet released).
 +  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.
- ))
- 
- One other output is possible:  when deleting files, the "%i" will output
+   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;
+@@ -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 *the_file_list;
- extern char *stdout_format;
+ extern struct file_list *cur_flist, *first_flist;
+ 
 --- old/testsuite/atimes.test
 +++ new/testsuite/atimes.test
 @@ -0,0 +1,19 @@
@@ -604,7 +533,7 @@ To use this patch, run these commands for a successful build:
 +
 +static void tls_usage(int ret)
 +{
-+	fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
++	fprintf(stderr, "usage: " PROGRAM " [--atime | -u] FILE ...\n"
 +	    "Trivial file listing program for portably checking rsync\n");
 +	exit(ret);
  }
@@ -613,7 +542,7 @@ To use this patch, run these commands for a successful build:
  main(int argc, char *argv[])
  {
 -	if (argc < 2) {
--		fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
+-		fprintf(stderr, "usage: " PROGRAM " FILE ...\n"
 -			"Trivial file listing program for portably checking rsync\n");
 -		return 1;
 -	}
@@ -650,16 +579,16 @@ To use this patch, run these commands for a successful build:
  }
 --- old/util.c
 +++ new/util.c
-@@ -121,7 +121,7 @@ NORETURN void overflow_exit(char *str)
+@@ -120,7 +120,7 @@ NORETURN void overflow_exit(const char *
  	exit_cleanup(RERR_MALLOC);
  }
  
--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)
+-int set_modtime(const char *fname, time_t modtime, mode_t mode)
++int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
  {
  #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
  	if (S_ISLNK(mode))
-@@ -129,9 +129,13 @@ int set_modtime(char *fname, time_t modt
+@@ -128,9 +128,13 @@ int set_modtime(const char *fname, time_
  #endif
  
  	if (verbose > 2) {
@@ -675,7 +604,7 @@ To use this patch, run these commands for a successful build:
  	}
  
  	if (dry_run)
-@@ -140,7 +144,7 @@ int set_modtime(char *fname, time_t modt
+@@ -139,7 +143,7 @@ int set_modtime(const char *fname, time_
  	{
  #ifdef HAVE_UTIMES
  		struct timeval t[2];
@@ -684,7 +613,7 @@ 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;
-@@ -153,12 +157,12 @@ int set_modtime(char *fname, time_t modt
+@@ -152,12 +156,12 @@ int set_modtime(const char *fname, time_
  		return utimes(fname, t);
  #elif defined HAVE_UTIMBUF
  		struct utimbuf tbuf;