X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/1cb60481a77e9776997763b3496f49b9bbe8a003..9978080ec09f62c426e6a1b81598a2f33bd91cd1:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index a87e2b0..f099b13 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,59 +4,38 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2006-01-14 08:14:29
-+++ batch.c	2006-01-24 19:18:36
-@@ -23,6 +23,7 @@ extern int do_compression;
- extern int def_compress_level;
- extern int protocol_version;
- extern char *batch_name;
-+extern unsigned int file_struct_len;
- 
- extern struct filter_list_struct filter_list;
- 
-@@ -222,9 +223,11 @@ void show_flist(int index, struct file_s
- 
- 	int i;
- 	for (i = 0; i < index; i++) {
--		rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
-+		rprintf(FINFO, "flist->flags=%#x\n", FFLAGS(fptr[i]));
- 		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-24 19:03:06
-+++ flist.c	2006-01-24 19:32:19
-@@ -50,6 +50,7 @@ extern int preserve_perms;
- extern int preserve_devices;
+--- orig/flist.c	2006-01-31 02:30:18
++++ flist.c	2006-01-27 00:33:39
+@@ -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 copy_links;
-@@ -83,7 +84,11 @@ void init_flist(void)
+ extern int prune_empty_dirs;
+@@ -85,7 +86,13 @@ void init_flist(void)
  	struct file_struct f;
  
  	/* Figure out how big the file_struct is without trailing padding */
 -	file_struct_len = offsetof(struct file_struct, flags) + sizeof f.flags;
 +	if (preserve_atimes)
-+		file_struct_len = offsetof(struct file_struct, flags);
++		file_struct_len = offsetof(struct file_struct, fl4g5);
 +	else
 +		file_struct_len = offsetof(struct file_struct, atime);
-+	file_struct_len += sizeof f.flags;
++	/* The "flags" uchar is no longer accessed directly, so I
++	 * mangled the name to fl4g5 as a reminder. */
++	file_struct_len += sizeof f.fl4g5;
  	checksum_len = protocol_version < 21 ? 2 : MD4_SUM_LENGTH;
  }
  
-@@ -139,16 +144,18 @@ static void list_file_entry(struct file_
+@@ -141,16 +148,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,
+ 			permbuf,
  			(double)f->length, timestring(f->modtime),
 +			preserve_atimes ? timestring(f->atime) : "",
  			f_name(f, NULL), f->u.link);
@@ -65,13 +44,13 @@ command before "make":
  	{
 -		rprintf(FINFO, "%s %11.0f %s %s\n",
 +		rprintf(FINFO, "%s %11.0f %s %s %s\n",
- 			perms,
+ 			permbuf,
  			(double)f->length, timestring(f->modtime),
 +			preserve_atimes ? timestring(f->atime) : "",
  			f_name(f, NULL));
  	}
  }
-@@ -310,6 +317,7 @@ static void send_file_entry(struct file_
+@@ -312,6 +321,7 @@ static void send_file_entry(struct file_
  {
  	unsigned short flags;
  	static time_t modtime;
@@ -79,7 +58,7 @@ command before "make":
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -325,7 +333,7 @@ static void send_file_entry(struct file_
+@@ -327,7 +337,7 @@ static void send_file_entry(struct file_
  
  	if (!file) {
  		write_byte(f, 0);
@@ -88,7 +67,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -337,7 +345,7 @@ static void send_file_entry(struct file_
+@@ -339,7 +349,7 @@ static void send_file_entry(struct file_
  
  	f_name(file, fname);
  
@@ -97,7 +76,7 @@ command before "make":
  
  	if (file->mode == mode)
  		flags |= XMIT_SAME_MODE;
-@@ -374,6 +382,12 @@ static void send_file_entry(struct file_
+@@ -375,6 +385,12 @@ static void send_file_entry(struct file_
  		flags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
@@ -110,7 +89,7 @@ command before "make":
  
  #ifdef SUPPORT_HARD_LINKS
  	if (file->link_u.idev) {
-@@ -427,6 +441,8 @@ static void send_file_entry(struct file_
+@@ -428,6 +444,8 @@ static void send_file_entry(struct file_
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -119,7 +98,7 @@ command before "make":
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		if (!numeric_ids)
  			add_uid(uid);
-@@ -494,6 +510,7 @@ static struct file_struct *receive_file_
+@@ -496,6 +514,7 @@ static struct file_struct *receive_file_
  					      unsigned short flags, int f)
  {
  	static time_t modtime;
@@ -127,7 +106,7 @@ command before "make":
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -512,7 +529,7 @@ static struct file_struct *receive_file_
+@@ -514,7 +533,7 @@ static struct file_struct *receive_file_
  	struct file_struct *file;
  
  	if (!flist) {
@@ -136,7 +115,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -568,6 +585,8 @@ static struct file_struct *receive_file_
+@@ -570,6 +589,8 @@ static struct file_struct *receive_file_
  		modtime = (time_t)read_int(f);
  	if (!(flags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -145,16 +124,16 @@ command before "make":
  
  	if (chmod_modes && !S_ISLNK(mode))
  		mode = tweak_mode(mode, chmod_modes);
-@@ -623,6 +642,8 @@ static struct file_struct *receive_file_
- 	file->length = file_length;
+@@ -625,6 +646,8 @@ static struct file_struct *receive_file_
  	file->mode = mode;
- 	file->ids = id_pair(uid, gid);
+ 	file->uid = uid;
+ 	file->gid = gid;
 +	if (preserve_atimes)
 +		file->atime = atime;
  
  	if (dirname_len) {
  		file->dirname = lastdir = bp;
-@@ -648,12 +669,12 @@ static struct file_struct *receive_file_
+@@ -650,12 +673,12 @@ static struct file_struct *receive_file_
  			    && lastname[del_hier_name_len-1] == '.'
  			    && lastname[del_hier_name_len-2] == '/')
  				del_hier_name_len -= 2;
@@ -169,7 +148,7 @@ command before "make":
  			else
  				in_del_hier = 0;
  		}
-@@ -874,11 +895,13 @@ struct file_struct *make_file(char *fnam
+@@ -871,12 +894,14 @@ struct file_struct *make_file(char *fnam
  	memset(bp, 0, file_struct_len);
  	bp += file_struct_len;
  
@@ -178,13 +157,14 @@ command before "make":
  	file->modtime = st.st_mtime;
  	file->length = st.st_size;
  	file->mode = st.st_mode;
- 	file->ids = id_pair(st.st_uid, st.st_gid);
+ 	file->uid = st.st_uid;
+ 	file->gid = st.st_gid;
 +	if (preserve_atimes)
 +		file->atime = st.st_atime;
  
  #ifdef SUPPORT_HARD_LINKS
  	if (flist && flist->hlink_pool) {
-@@ -989,7 +1012,7 @@ static void send_if_directory(int f, str
+@@ -989,7 +1014,7 @@ static void send_if_directory(int f, str
  	char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/');
  
  	if (S_ISDIR(file->mode)
@@ -193,19 +173,19 @@ command before "make":
  		void *save_filters;
  		unsigned int len = strlen(fbuf);
  		if (len > 1 && fbuf[len-1] == '/')
-@@ -1567,8 +1590,9 @@ static void clean_flist(struct file_list
+@@ -1595,8 +1620,9 @@ static void clean_flist(struct file_list
  			}
- 			/* Make sure that if we unduplicate '.', that we don't
- 			 * lose track of a user-specified top directory. */
+ 			/* 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);
 +			FFLAGS(flist->files[keep])
 +			    |= FFLAGS(flist->files[drop])
 +			     & (FLAG_TOP_DIR|FLAG_DEL_HERE);
  
- 			clear_file(drop, flist);
+ 			clear_file(flist->files[drop], flist);
  
-@@ -1630,7 +1654,7 @@ static void output_flist(struct file_lis
+@@ -1720,7 +1746,7 @@ static void output_flist(struct file_lis
  			file->dirname ? file->dirname : "",
  			file->dirname ? "/" : "", NS(file->basename),
  			S_ISDIR(file->mode) ? "/" : "", (int)file->mode,
@@ -214,17 +194,17 @@ command before "make":
  	}
  }
  
---- orig/generator.c	2006-01-24 19:03:07
-+++ generator.c	2006-01-24 19:19:42
-@@ -44,6 +44,7 @@ extern int preserve_uid;
+--- orig/generator.c	2006-01-31 02:30:18
++++ generator.c	2006-01-26 09:15:22
+@@ -44,6 +44,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;
-@@ -89,6 +90,7 @@ extern dev_t filesystem_dev;
+@@ -91,6 +92,7 @@ extern dev_t filesystem_dev;
  extern char *backup_dir;
  extern char *backup_suffix;
  extern int backup_suffix_len;
@@ -232,7 +212,7 @@ command before "make":
  extern struct file_list *the_file_list;
  extern struct filter_list_struct server_filter_list;
  
-@@ -183,7 +185,7 @@ static int delete_item(char *fname, int 
+@@ -185,7 +187,7 @@ static int delete_item(char *fname, int 
  	for (j = dirlist->count; j--; ) {
  		struct file_struct *fp = dirlist->files[j];
  
@@ -241,7 +221,7 @@ command before "make":
  			continue;
  
  		strlcpy(p, fp->basename, remainder);
-@@ -261,7 +263,7 @@ static void delete_in_dir(struct file_li
+@@ -263,7 +265,7 @@ static void delete_in_dir(struct file_li
  	filt_array[cur_depth] = push_local_filters(fbuf, dlen);
  
  	if (one_file_system) {
@@ -250,7 +230,7 @@ command before "make":
  			filesystem_dev = stp->st_dev;
  		else if (filesystem_dev != stp->st_dev)
  			return;
-@@ -273,7 +275,7 @@ static void delete_in_dir(struct file_li
+@@ -275,7 +277,7 @@ static void delete_in_dir(struct file_li
  	 * from the filesystem. */
  	for (i = dirlist->count; i--; ) {
  		struct file_struct *fp = dirlist->files[i];
@@ -258,8 +238,8 @@ command before "make":
 +		if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT)
  			continue;
  		if (flist_find(flist, fp) < 0) {
- 			int mode = fp->mode;
-@@ -300,11 +302,11 @@ static void do_delete_pass(struct file_l
+ 			f_name(fp, delbuf);
+@@ -301,11 +303,11 @@ static void do_delete_pass(struct file_l
  	for (j = 0; j < flist->count; j++) {
  		struct file_struct *file = flist->files[j];
  
@@ -273,29 +253,20 @@ command before "make":
  			rprintf(FINFO, "deleting in %s\n", fbuf);
  
  		if (link_stat(fbuf, &st, keep_dirlinks) < 0
-@@ -344,10 +346,18 @@ void itemize(struct file_struct *file, i
- 
- 		if (S_ISREG(file->mode) && file->length != st->st_size)
+@@ -347,8 +349,11 @@ void itemize(struct file_struct *file, i
  			iflags |= ITEM_REPORT_SIZE;
--		if ((iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !keep_time
--		     && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ 		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)) {
++		    || (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_atimes && !S_ISDIR(file->mode) && !S_ISLNK(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))
  			iflags |= ITEM_REPORT_PERMS;
-@@ -396,7 +406,7 @@ int unchanged_file(char *fn, struct file
+@@ -397,7 +402,7 @@ int unchanged_file(char *fn, struct file
  	if (ignore_times)
  		return 0;
  
@@ -304,7 +275,7 @@ command before "make":
  }
  
  
-@@ -550,13 +560,13 @@ static int find_fuzzy(struct file_struct
+@@ -551,13 +556,13 @@ static int find_fuzzy(struct file_struct
  		uint32 dist;
  
  		if (!S_ISREG(fp->mode) || !fp->length
@@ -320,7 +291,7 @@ command before "make":
  			if (verbose > 4) {
  				rprintf(FINFO,
  					"fuzzy size/modtime match for %s\n",
-@@ -632,7 +642,7 @@ static int try_dests_reg(struct file_str
+@@ -633,7 +638,7 @@ static int try_dests_reg(struct file_str
  			if (!unchanged_attrs(file, stp))
  				continue;
  			if ((always_checksum || ignore_times)
@@ -329,7 +300,16 @@ command before "make":
  				continue;
  			best_match = j;
  			match_level = 3;
-@@ -894,7 +904,7 @@ static void recv_generator(char *fname, 
+@@ -660,6 +665,8 @@ static int try_dests_reg(struct file_str
+ 					  itemizing && verbose > 1,
+ 					  code) < 0)
+ 				goto try_a_copy;
++			if (preserve_atimes)
++				set_file_attrs(fname, file, stp, 0);
+ 			if (preserve_hard_links && file->link_u.links)
+ 				hard_link_cluster(file, ndx, itemizing, code);
+ 		} else if (itemizing)
+@@ -895,7 +902,7 @@ static void recv_generator(char *fname, 
  		    && verbose && code && f_out != -1)
  			rprintf(code, "%s/\n", fname);
  		if (delete_during && f_out != -1 && !phase && dry_run < 2
@@ -338,7 +318,7 @@ command before "make":
  			delete_in_dir(the_file_list, fname, file, &st);
  		return;
  	}
-@@ -1071,7 +1081,7 @@ static void recv_generator(char *fname, 
+@@ -1074,7 +1081,7 @@ static void recv_generator(char *fname, 
  	}
  
  	if (update_only && statret == 0
@@ -347,7 +327,7 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO, "%s is newer\n", fname);
  		return;
-@@ -1174,7 +1184,7 @@ static void recv_generator(char *fname, 
+@@ -1177,7 +1184,7 @@ static void recv_generator(char *fname, 
  	if (fuzzy_basis) {
  		int j = flist_find(fuzzy_dirlist, file);
  		if (j >= 0) /* don't use changing file as future fuzzy basis */
@@ -407,8 +387,8 @@ command before "make":
 +	} while (!(FFLAGS(file) & FLAG_HLINK_EOL));
  #endif
  }
---- orig/log.c	2006-01-24 17:00:34
-+++ log.c	2005-12-15 23:05:44
+--- orig/log.c	2006-01-26 10:45:39
++++ log.c	2006-01-24 22:50:01
 @@ -38,6 +38,7 @@ extern int module_id;
  extern int msg_fd_out;
  extern int protocol_version;
@@ -417,29 +397,26 @@ command before "make":
  extern int log_format_has_i;
  extern int log_format_has_o_or_i;
  extern int daemon_log_format_has_o_or_i;
-@@ -543,11 +544,14 @@ static void log_formatted(enum logcode c
+@@ -543,10 +544,12 @@ static void log_formatted(enum logcode c
+ 			n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's';
  			n[4] = !(iflags & ITEM_REPORT_TIME) ? '.'
- 			     : !preserve_times || IS_DEVICE(file->mode)
- 					       || S_ISLNK(file->mode) ? 'T' : 't';
+ 			     : !preserve_times || 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[8] = '\0';
 +			n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.'
-+			     : !preserve_atimes || IS_DEVICE(file->mode)
-+					        || S_ISLNK(file->mode) ? 'A' : 'a';
++			     : S_ISLNK(file->mode) ? 'U' : 'u';
 +			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';
++			n[9] = '\0';
  
  			if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) {
  				char ch = iflags & ITEM_IS_NEW ? '+' : '?';
---- orig/options.c	2006-01-23 18:48:23
-+++ options.c	2005-11-07 04:32:19
-@@ -50,6 +50,7 @@ int preserve_uid = 0;
+--- orig/options.c	2006-01-31 03:11:30
++++ options.c	2006-01-31 03:08:39
+@@ -52,6 +52,7 @@ int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
  int omit_dir_times = 0;
@@ -447,48 +424,48 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -291,8 +292,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");
+@@ -299,8 +300,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," -k, --atimes                preserve (keep) 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");
-@@ -400,6 +402,9 @@ static struct poptOption long_options[] 
+@@ -412,6 +414,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",          'k', 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-k",             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 },
-@@ -1468,6 +1473,8 @@ void server_options(char **args,int *arg
+   {"super",            0,  POPT_ARG_VAL,    &am_root, 2, 0, 0 },
+@@ -1505,6 +1510,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
 +	if (preserve_atimes)
-+		argstr[x++] = 'k';
- 	if (omit_dir_times == 2 && am_sender)
- 		argstr[x++] = 'O';
++		argstr[x++] = 'U';
  	if (preserve_perms)
---- orig/rsync.c	2006-01-24 19:03:07
-+++ 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)
+--- orig/rsync.c	2006-01-31 02:30:18
++++ rsync.c	2006-01-31 03:00:22
+@@ -28,6 +28,7 @@ extern int daemon_log_format_has_i;
+ extern int preserve_executability;
  extern int preserve_times;
  extern int omit_dir_times;
 +extern int preserve_atimes;
+ extern int orig_umask;
  extern int am_root;
  extern int am_server;
- extern int am_sender;
-@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st
+@@ -78,6 +79,7 @@ int set_file_attrs(char *fname, struct f
  	int updated = 0;
  	STRUCT_STAT st2;
  	int change_uid, change_gid;
@@ -496,13 +473,17 @@ command before "make":
  
  	if (!st) {
  		if (dry_run)
-@@ -70,16 +72,29 @@ int set_perms(char *fname,struct file_st
+@@ -90,18 +92,33 @@ int set_file_attrs(char *fname, struct f
+ 		st = &st2;
+ 	}
  
++	/* 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)
++		flags |= ATTRS_SKIP_ATIME;
+ 	if (!(flags & ATTRS_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) {
@@ -510,7 +491,7 @@ command before "make":
 +		updated = 1;
 +	} else
 +		mtime = st->st_mtime;
-+	if (!(flags & PERMS_SKIP_ATIME)
++	if (!(flags & ATTRS_SKIP_ATIME)
 +	    && cmp_time(st->st_atime, file->atime) != 0) {
 +		atime = file->atime;
 +		updated = 1;
@@ -529,9 +510,9 @@ command before "make":
 +			updated = 0;
  	}
  
- 	change_uid = am_root && preserve_uid && st->st_uid != file->ids->uid;
---- orig/rsync.h	2006-01-24 19:03:07
-+++ rsync.h	2006-01-24 19:32:22
+ 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
+--- orig/rsync.h	2006-01-30 20:39:09
++++ rsync.h	2006-01-24 22:38:08
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)
@@ -542,9 +523,9 @@ command before "make":
  
 @@ -119,6 +120,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
@@ -556,12 +537,13 @@ command before "make":
  #define ITEM_REPORT_CHECKSUM (1<<1)
  #define ITEM_REPORT_SIZE (1<<2)
  #define ITEM_REPORT_TIME (1<<3)
-@@ -524,9 +527,12 @@ struct file_struct {
- 	struct id_pair *ids;
- 	time_t modtime;
+@@ -520,9 +523,12 @@ struct file_struct {
+ 	uid_t uid;
+ 	gid_t gid;
  	mode_t mode;
+-	uchar flags;	/* this item MUST remain last */
 +	time_t atime;   /* this MUST be second to last */
- 	uchar flags;	/* this item MUST remain last */
++	uchar fl4g5;	/* this item MUST remain last */
  };
  
 +#define FFLAGS(f) ((uchar*)(f))[file_struct_len-1]
@@ -569,43 +551,45 @@ command before "make":
  /*
   * Start the flist array at FLIST_START entries and grow it
   * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR
---- orig/rsync.yo	2006-01-24 19:03:08
-+++ 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)
+--- orig/rsync.yo	2006-01-31 03:05:44
++++ rsync.yo	2006-01-31 03:06:45
+@@ -323,8 +323,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
-+ -k, --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
+@@ -771,6 +772,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(-k, --atimes)) This tells rsync to keep the access times of the
-+destination files the same value as the source files.  Note that 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
-@@ -1180,7 +1187,7 @@ with older versions of rsync, but that a
+ 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
+@@ -1278,8 +1285,8 @@ if the receiving rsync is at least versi
+ with older versions of rsync, but that also turns on the output of other
  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
+-The "%i" escape has a cryptic output that is 8 letters long.  The general
+-format is like the string bf(YXcstpog), where bf(Y) is replaced by the
++The "%i" escape has a cryptic output that is 9 letters long.  The general
++format is like the string bf(YXcstupog), where bf(Y) 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.
-@@ -1219,17 +1226,22 @@ quote(itemize(
+@@ -1319,9 +1326,13 @@ 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)
@@ -613,24 +597,13 @@ 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(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
++  anytime a symlink is transferred.
    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).
-   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.
- ))
- 
- One other output is possible:  when deleting files, the "%i" will output
 --- orig/sender.c	2006-01-14 20:27:10
 +++ sender.c	2006-01-24 18:10:23
 @@ -38,6 +38,7 @@ extern int do_progress;
@@ -659,8 +632,8 @@ command before "make":
  	}
  	make_backups = save_make_backups;
  
---- orig/testsuite/atimes.test	2006-01-24 19:30:25
-+++ testsuite/atimes.test	2006-01-24 19:30:25
+--- orig/testsuite/atimes.test	2006-01-24 22:54:53
++++ testsuite/atimes.test	2006-01-24 22:54:53
 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +
@@ -677,226 +650,279 @@ command before "make":
 +
 +TLS_ARGS=--atime
 +
-+checkit "$RSYNC -rtkgvvv \"$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	2006-01-24 19:29:18
-@@ -44,14 +44,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/
+--- orig/testsuite/devices.test	2006-01-30 08:12:44
++++ testsuite/devices.test	2006-01-26 10:53:43
+@@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc
+ $RSYNC -ai "$fromdir/block" "$todir/block2" \
+     | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-cD++++++ block
++cD+++++++ block
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
+ 
+ $RSYNC -ai "$fromdir/block2" "$todir/block" \
+     | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-cD++++++ block2
++cD+++++++ block2
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
+ 
+@@ -58,7 +58,7 @@ sleep 1
+ $RSYNC -Di "$fromdir/block3" "$todir/block" \
+     | tee "$outfile"
+ cat <<EOT >"$chkfile"
+-cD..T... block3
++cD..T.... block3
+ EOT
+ diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
+ 
+@@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \
+     | tee "$outfile"
+ filter_outfile
+ cat <<EOT >"$chkfile"
+-.d..t... ./
+-cD..t... block
+-cD...... block2
+-cD++++++ block3
+-hD++++++ block2.5 => block3
+-cD++++++ char
+-cD++++++ char2
+-cD++++++ char3
+-cS++++++ fifo
++.d..t.... ./
++cD..t.... block
++cD....... block2
++cD+++++++ block3
++hD+++++++ block2.5 => block3
++cD+++++++ char
++cD+++++++ char2
++cD+++++++ char3
++cS+++++++ fifo
+ EOT
+ if test ! -b "$fromdir/block2.5"; then
+     sed -e '/block2\.5/d' \
+--- orig/testsuite/itemize.test	2006-01-30 08:12:44
++++ testsuite/itemize.test	2006-01-24 22:32:03
+@@ -31,14 +31,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
+-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"
+@@ -50,10 +50,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
+->f..T... bar/baz/rsync
+->f..T... foo/config1
+->f.sTp.. foo/config2
+-hf..T... foo/extra => foo/config1
++>f..T.... bar/baz/rsync
++>f..T.... foo/config1
++>f.sT.p.. foo/config2
++hf..T.... foo/extra => foo/config1
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
  
-@@ -83,11 +83,11 @@ chmod 777 "$todir/bar/baz/rsync"
+@@ -70,11 +70,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
+-.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..T.... foo/sym -> ../bar/baz/rsync
  EOT
  diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
  
-@@ -112,15 +112,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
+@@ -99,15 +99,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
+-.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"
+@@ -126,8 +126,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
+-.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" "$
+@@ -136,15 +136,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..TA.... 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
++.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"
+@@ -152,11 +152,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
+-.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" "$
+@@ -183,15 +183,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
+-.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"
+@@ -199,10 +199,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/
+-.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
+@@ -230,14 +230,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
+-.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"
+@@ -245,10 +245,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/
+-.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
+--- orig/testsuite/rsync.fns	2006-01-30 08:12:44
 +++ testsuite/rsync.fns	2005-07-28 00:41:20
-@@ -50,7 +50,7 @@ printmsg() {
+@@ -67,7 +67,7 @@ printmsg() {
  
  
  rsync_ls_lR() {
@@ -905,7 +931,7 @@ command before "make":
  }
  
  rsync_getgroups() { 
-@@ -158,6 +158,10 @@ checkit() {
+@@ -175,6 +175,10 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
@@ -916,7 +942,7 @@ command before "make":
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -165,10 +169,13 @@ checkit() {
+@@ -182,10 +186,13 @@ checkit() {
  	failed="YES";
      fi
  
@@ -1068,7 +1094,7 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2006-01-20 00:12:48
+--- orig/util.c	2006-01-30 07:18:28
 +++ util.c	2006-01-14 08:20:29
 @@ -130,7 +130,7 @@ void overflow_exit(char *str)
  
@@ -1119,7 +1145,7 @@ command before "make":
  		t[1] = modtime;
  		return utime(fname,t);
  #else
-@@ -1175,8 +1179,8 @@ int msleep(int t)
+@@ -1183,8 +1187,8 @@ int msleep(int t)
  
  
  /**
@@ -1130,7 +1156,7 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
-@@ -1185,7 +1189,7 @@ int msleep(int t)
+@@ -1193,7 +1197,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/