X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/93ca4d27d3d0806c3085aef4dbb331ba451b3dc4..a302c04819c87d365481d9a8b516d3c20df8bf46:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 7ca9204..b49ccc8 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -1,82 +1,82 @@
-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
+    ./prepare-source
+    ./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;
+--- old/compat.c
++++ new/compat.c
+@@ -50,6 +50,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 (remote_protocol == 0) {
+ 		if (!read_batch)
+--- old/flist.c
++++ new/flist.c
+@@ -47,6 +47,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 copy_links;
-@@ -140,16 +141,18 @@ static void list_file_entry(struct file_
+ extern int file_extra_cnt;
+@@ -137,6 +138,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)) {
+@@ -149,14 +151,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",
- 			perms,
- 			(double)f->length, timestring(f->modtime),
-+			timestring(f->atime),
- 			f_name(f), f->u.link);
+ 			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",
- 			perms,
- 			(double)f->length, timestring(f->modtime),
-+			timestring(f->atime),
- 			f_name(f));
+ 			permbuf, len, timestring(f->modtime),
++			preserve_atimes ? timestring(atime) : "",
+ 			f_name(f, NULL));
  	}
  }
-@@ -311,6 +314,7 @@ void send_file_entry(struct file_struct 
+@@ -313,6 +317,7 @@ void flist_expand(struct file_list *flis
+ static void send_file_entry(struct file_struct *file, int f, int ndx)
  {
- 	unsigned short flags;
  	static time_t modtime;
 +	static time_t atime;
  	static mode_t mode;
  	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 
+@@ -367,6 +372,13 @@ static void send_file_entry(struct file_
  		flags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
 +	if (preserve_atimes && !S_ISDIR(mode)) {
-+		if (file->atime == atime)
++		time_t file_atime = F_ATIME(file);
++		if (file_atime == atime)
 +			flags |= 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 
+ 	if (tmp_dev != 0) {
+@@ -434,6 +446,8 @@ static void send_file_entry(struct file_
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -85,140 +85,103 @@ command before "make":
  	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)
+@@ -501,7 +515,7 @@ static void send_file_entry(struct file_
+ static struct file_struct *recv_file_entry(struct file_list *flist,
+ 					   int flags, int f)
  {
- 	static time_t modtime;
-+	static time_t atime;
+-	static time_t modtime;
++	static time_t modtime, atime;
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -513,7 +526,7 @@ static struct file_struct *receive_file_
+@@ -522,7 +536,7 @@ static struct file_struct *recv_file_ent
  	struct file_struct *file;
  
  	if (!flist) {
 -		modtime = 0, mode = 0;
 +		modtime = 0, atime = 0, mode = 0;
- 		dev = 0, rdev = makedev(0, 0);
+ 		dev = 0, rdev = MAKEDEV(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -569,6 +582,8 @@ static struct file_struct *receive_file_
+@@ -610,6 +624,8 @@ static struct file_struct *recv_file_ent
  		modtime = (time_t)read_int(f);
  	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_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;
+ 	if (chmod_modes && !S_ISLNK(mode))
+ 		mode = tweak_mode(mode, chmod_modes);
+@@ -700,6 +716,8 @@ static struct file_struct *recv_file_ent
+ 		F_UID(file) = uid;
+ 	if (preserve_gid)
+ 		F_GID(file) = gid;
++	if (preserve_atimes)
++		F_ATIME(file) = atime;
+ 
+ 	if (dirname_len) {
+ 		file->dirname = lastdir = bp;
+@@ -1002,6 +1020,8 @@ struct file_struct *make_file(const char
+ 		F_UID(file) = st.st_uid;
+ 	if (preserve_gid)
+ 		F_GID(file) = st.st_gid;
++	if (preserve_atimes)
++		F_ATIME(file) = st.st_atime;
+ 
+ 	if (dirname_len) {
+ 		file->dirname = lastdir = bp;
+--- old/generator.c
++++ new/generator.c
+@@ -43,6 +43,7 @@ extern int preserve_perms;
+ extern int preserve_uid;
  extern int preserve_gid;
  extern int preserve_times;
- extern int omit_dir_times;
 +extern int preserve_atimes;
+ extern int omit_dir_times;
+ extern int delete_mode;
  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)) {
+@@ -547,6 +548,9 @@ void itemize(struct file_struct *file, i
+ 		  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ 		 || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
  			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 (preserve_perms
- 		 && (file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS))
++		if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
++		 && cmp_time(F_ATIME(file), st->st_atime) != 0)
++			iflags |= ITEM_REPORT_ATIME;
+ 		if (!BITS_EQUAL(st->st_mode, file->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;
- }
- 
- 
-@@ -555,7 +564,7 @@ static int find_fuzzy(struct file_struct
- 		name = fp->basename;
- 
- 		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, 
- 	}
- 
- 	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;
+ 		if (preserve_uid && am_root && F_UID(file) != st->st_uid)
+@@ -858,6 +862,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 && F_IS_HLINKED(file))
+ 				finish_hard_link(file, fname, stp, itemizing, code, j);
+ 			if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+--- old/log.c
++++ new/log.c
+@@ -37,6 +37,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 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';
+ extern int preserve_uid;
+ extern int preserve_gid;
+ extern int stdout_format_has_i;
+@@ -625,7 +626,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] = '.';
++			c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
++			     : S_ISLNK(file->mode) ? 'U' : 'u';
+ 			c[9] = '\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;
+--- old/options.c
++++ new/options.c
+@@ -55,6 +55,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
  int omit_dir_times = 0;
@@ -226,73 +189,79 @@ command before "make":
  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");
+@@ -306,8 +307,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");
 -  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," -U, --atimes                preserve access (use) 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");
-@@ -402,6 +404,9 @@ static struct poptOption long_options[] 
+@@ -424,6 +426,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 },
++  {"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 },
-   {"owner",           'o', POPT_ARG_VAL,    &preserve_uid, 1, 0, 0 },
-@@ -1442,6 +1447,8 @@ void server_options(char **args,int *arg
+   {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
+@@ -1536,6 +1541,8 @@ void server_options(char **args,int *arg
  		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;
+ 		argstr[x++] = 'p';
+ 	else if (preserve_executability && am_sender)
+--- old/rsync.c
++++ new/rsync.c
+@@ -34,6 +34,7 @@ extern int verbose;
+ extern int dry_run;
+ extern int preserve_perms;
+ extern int preserve_executability;
++extern int preserve_atimes;
  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
+@@ -182,6 +183,7 @@ int set_file_attrs(char *fname, struct f
  	int updated = 0;
  	STRUCT_STAT st2;
  	int change_uid, change_gid;
 +	time_t atime, mtime;
+ 	mode_t new_mode = file->mode;
  
  	if (!st) {
- 		if (dry_run)
-@@ -70,16 +72,29 @@ int set_perms(char *fname,struct file_st
+@@ -201,18 +203,36 @@ int set_file_attrs(char *fname, struct f
+ 		}
+ 	}
  
++	/* 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))
- 		flags |= PERMS_SKIP_MTIME;
+ 		flags |= ATTRS_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) {
++		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(st->st_mtime, file->modtime) != 0) {
 +		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;
++	if (!(flags & ATTRS_SKIP_ATIME)) {
++		time_t file_atime = F_ATIME(file);
++		if (cmp_time(st->st_atime, file_atime) != 0) {
++			atime = file_atime;
++			updated = 1;
++		} else
++			atime = st->st_atime;
 +	} else
 +		atime = st->st_atime;
 +	if (updated) {
@@ -308,78 +277,78 @@ command before "make":
 +			updated = 0;
  	}
  
- 	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)
+ 	change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
+--- old/rsync.h
++++ new/rsync.h
+@@ -55,6 +55,7 @@
+ #define XMIT_SAME_DEV_pre30 (1<<10)	/* protocols < 30 */
+ #define XMIT_HLINK_FIRST (1<<10)	/* protocols >= 30 */
  #define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
 +#define XMIT_SAME_ATIME (1<<12)
  
  /* These flags are used in the live flist data. */
  
-@@ -119,6 +120,7 @@
+@@ -128,6 +129,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)
+@@ -551,6 +553,7 @@ struct file_struct {
+ extern int file_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_atimes;
+ 
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -583,6 +586,7 @@ extern int preserve_gid;
+ /* When the associated option is on, all entries will have these present: */
+ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
+ #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
++#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
+ 
+ /* These items are per-entry optional and mutally exclusive: */
+ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -328,8 +328,9 @@ to the detailed description below for a 
+      --devices               preserve device files (super-user only)
+      --specials              preserve special files
+  -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
-+ -A, --atimes                preserve access times
-      --chmod=CHMOD           change destination permissions
++ -U, --atimes                preserve access (use) times
+      --super                 receiver attempts super-user activities
   -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
+@@ -870,6 +871,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
++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').
+ 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
+@@ -1403,7 +1410,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(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
+-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.
-@@ -1199,17 +1206,22 @@ quote(itemize(
+@@ -1443,7 +1450,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)
@@ -387,26 +356,31 @@ command before "make":
 +  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).
+@@ -1452,7 +1459,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(z) 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.
  ))
  
  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
+--- old/sender.c
++++ new/sender.c
+@@ -41,6 +41,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;
+--- old/testsuite/atimes.test
++++ new/testsuite/atimes.test
 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +
@@ -423,235 +397,22 @@ command before "make":
 +
 +TLS_ARGS=--atime
 +
-+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() {
- 
+--- 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
  }
  
- rsync_getgroups() { 
-@@ -158,6 +158,10 @@ checkit() {
+ check_perms() {
+@@ -184,6 +184,10 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
@@ -662,7 +423,7 @@ command before "make":
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -165,10 +169,13 @@ checkit() {
+@@ -191,10 +195,13 @@ checkit() {
  	failed="YES";
      fi
  
@@ -677,45 +438,46 @@ command before "make":
      ( 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 @@
- 
+--- old/tls.c
++++ new/tls.c
+@@ -34,6 +34,7 @@
+  * change. */
  
  #include "rsync.h"
 +#include "popt.h"
  
  #define PROGRAM "tls"
  
-@@ -48,6 +49,7 @@ int read_only = 1;
+@@ -43,6 +44,8 @@ int read_only = 1;
  int list_only = 0;
  int preserve_perms = 0;
  
 +static int display_atime = 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",
+@@ -50,12 +53,29 @@ static void failed(char const *what, cha
  	exit(1);
  }
  
-+static void storetime(char *dest, time_t t)
++static void storetime(char *dest, time_t t, size_t destsize)
 +{
 +	if (t) {
 +		struct tm *mt = gmtime(&t);
- 
-+		sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
++
++		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);
-+	} else {
-+		strcpy(dest, "                    ");
-+	}
-+}	
- 
++	} else
++		strlcpy(dest, "                    ", destsize);
++}
++
  static void list_file(const char *fname)
  {
  	STRUCT_STAT buf;
@@ -727,29 +489,29 @@ command before "make":
  	char linkbuf[4096];
  
  	if (do_lstat(fname, &buf) < 0)
-@@ -96,19 +113,8 @@ static void list_file(const char *fname)
+@@ -88,19 +108,8 @@ static void list_file(const char *fname)
  
  	permstring(permbuf, buf.st_mode);
  
 -	if (buf.st_mtime) {
 -		mt = gmtime(&buf.st_mtime);
 -
--		sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
+-		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);
--	} else {
--		strcpy(datebuf, "                   ");
--	}
-+	storetime(mtimebuf, buf.st_mtime);
-+	storetime(atimebuf, buf.st_atime);
+-	} else
+-		strlcpy(datebuf, "                   ", sizeof datebuf);
++	storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
++	storetime(atimebuf, buf.st_atime, sizeof atimebuf);
  
  	/* TODO: Perhaps escape special characters in fname? */
  
-@@ -119,24 +125,55 @@ static void list_file(const char *fname)
+@@ -111,23 +120,55 @@ 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);
@@ -759,8 +521,8 @@ command before "make":
 -	       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},
@@ -770,22 +532,25 @@ command before "make":
 +
 +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);
-+}
+ }
  
  int
  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;
+-	}
 +	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) {
@@ -801,9 +566,6 @@ command before "make":
 +		}
  	}
  
--	for (argv++; *argv; argv++) {
--		list_file(*argv);
--	}
 +	extra_args = poptGetArgs(pc);
 +	if (*extra_args == NULL)
 +		tls_usage(1);
@@ -811,21 +573,21 @@ command before "make":
 +	for (; *extra_args; extra_args++)
 +		list_file(*extra_args);
 +	poptFreeContext(pc);
- 
++
  	return 0;
  }
---- 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)
- 
- 
+--- old/util.c
++++ new/util.c
+@@ -121,7 +121,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))
-@@ -138,9 +138,13 @@ int set_modtime(char *fname, time_t modt
+@@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_
  #endif
  
  	if (verbose > 2) {
@@ -841,7 +603,7 @@ command before "make":
  	}
  
  	if (dry_run)
-@@ -149,7 +153,7 @@ int set_modtime(char *fname, time_t modt
+@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_
  	{
  #ifdef HAVE_UTIMES
  		struct timeval t[2];
@@ -850,7 +612,7 @@ command before "make":
  		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
+@@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_
  		return utimes(fname, t);
  #elif defined HAVE_UTIMBUF
  		struct utimbuf tbuf;
@@ -865,23 +627,3 @@ command before "make":
  		t[1] = modtime;
  		return utime(fname,t);
  #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)