[rsync/rsync-patches.git] / atimes.diff

After applying this patch and running configure, you MUST run this
command before "make":

    make proto


--- batch.c	6 Mar 2004 07:45:52 -0000	1.31
+++ batch.c	13 May 2004 18:54:03 -0000
@@ -342,6 +342,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);
--- flist.c	11 May 2004 17:25:16 -0000	1.221
+++ flist.c	13 May 2004 18:54:03 -0000
@@ -57,6 +57,7 @@ extern int relative_paths;
 extern int implied_dirs;
 extern int copy_links;
 extern int copy_unsafe_links;
+extern int copy_atimes;
 extern int protocol_version;
 extern int sanitize_paths;
 
@@ -139,16 +140,16 @@ static void list_file_entry(struct file_
 
 #if 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),
-			f_name(f), f->u.link);
+			timestring(f->atime), f_name(f), f->u.link);
 	} 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),
-			f_name(f));
+			timestring(f->atime), f_name(f));
 }
 
 
@@ -325,6 +326,7 @@ void send_file_entry(struct file_struct 
 {
 	unsigned short flags;
 	static time_t modtime;
+	static time_t atime;
 	static mode_t mode;
 	static uint64 dev;
 	static dev_t rdev;
@@ -340,7 +342,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;
@@ -389,6 +391,12 @@ void send_file_entry(struct file_struct 
 		flags |= XMIT_SAME_TIME;
 	else
 		modtime = file->modtime;
+	if (copy_atimes && !S_ISDIR(mode)) {
+		if (file->atime == atime)
+			flags |= XMIT_SAME_ATIME;
+		else
+			atime = file->atime;
+	}
 
 #if SUPPORT_HARD_LINKS
 	if (file->link_u.idev) {
@@ -444,6 +452,8 @@ void send_file_entry(struct file_struct 
 		write_int(f, modtime);
 	if (!(flags & XMIT_SAME_MODE))
 		write_int(f, to_wire_mode(mode));
+	if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
+		write_int(f, atime);
 	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
 		if (!numeric_ids)
 			add_uid(uid);
@@ -517,6 +527,7 @@ void receive_file_entry(struct file_stru
     struct file_list *flist, int f)
 {
 	static time_t modtime;
+	static time_t atime;
 	static mode_t mode;
 	static uint64 dev;
 	static dev_t rdev;
@@ -533,7 +544,7 @@ void receive_file_entry(struct file_stru
 	struct file_struct *file;
 
 	if (!fptr) {
-		modtime = 0, mode = 0;
+		modtime = 0, atime = 0, mode = 0;
 		dev = 0, rdev = makedev(0, 0);
 		rdev_major = 0;
 		uid = 0, gid = 0;
@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru
 		modtime = (time_t)read_int(f);
 	if (!(flags & XMIT_SAME_MODE))
 		mode = from_wire_mode(read_int(f));
+	if (copy_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);
@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru
 
 	file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
 	file->modtime = modtime;
+	file->atime = atime;
 	file->length = file_length;
 	file->mode = mode;
 	file->uid = uid;
@@ -852,6 +866,7 @@ skip_excludes:
 
 	file->flags = flags;
 	file->modtime = st.st_mtime;
+	file->atime = st.st_atime;
 	file->length = st.st_size;
 	file->mode = st.st_mode;
 	file->uid = st.st_uid;
--- generator.c	13 May 2004 06:55:01 -0000	1.82
+++ generator.c	13 May 2004 18:54:03 -0000
@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
 		return 0;
 	}
 
-	return (cmp_modtime(st->st_mtime,file->modtime) == 0);
+	return cmp_time(st->st_mtime,file->modtime) == 0;
 }
 
 
@@ -466,7 +466,7 @@ void recv_generator(char *fname, struct 
 		return;
 	}
 
-	if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
+	if (update_only && cmp_time(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
 		if (verbose > 1)
 			rprintf(FINFO,"%s is newer\n",fname);
 		return;
--- options.c	6 May 2004 21:08:01 -0000	1.148
+++ options.c	13 May 2004 18:54:04 -0000
@@ -46,6 +46,7 @@ int preserve_devices = 0;
 int preserve_uid = 0;
 int preserve_gid = 0;
 int preserve_times = 0;
+int copy_atimes = 0;
 int update_only = 0;
 int cvs_exclude = 0;
 int dry_run = 0;
@@ -241,6 +242,7 @@ void usage(enum logcode F)
   rprintf(F," -g, --group                 preserve group\n");
   rprintf(F," -D, --devices               preserve devices (root only)\n");
   rprintf(F," -t, --times                 preserve times\n");
+  rprintf(F," -A, --copy-atimes           copy access times\n");
   rprintf(F," -S, --sparse                handle sparse files efficiently\n");
   rprintf(F," -n, --dry-run               show what would have been transferred\n");
   rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
@@ -346,6 +348,7 @@ static struct poptOption long_options[] 
   {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
   {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
   {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
+  {"copy-atimes",     'A', POPT_ARG_NONE,   &copy_atimes, 0, 0, 0 },
   {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
   {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
   {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
@@ -823,6 +826,8 @@ void server_options(char **args,int *arg
 		argstr[x++] = 'D';
 	if (preserve_times)
 		argstr[x++] = 't';
+	if (copy_atimes)
+		argstr[x++] = 'A';
 	if (preserve_perms)
 		argstr[x++] = 'p';
 	if (recurse)
--- rsync.c	13 May 2004 18:51:22 -0000	1.138
+++ rsync.c	13 May 2004 18:54:04 -0000
@@ -25,6 +25,7 @@
 extern int verbose;
 extern int dry_run;
 extern int preserve_times;
+extern int copy_atimes;
 extern int am_root;
 extern int am_sender;
 extern int am_generator;
@@ -140,17 +141,31 @@ int set_perms(char *fname,struct file_st
 
 	if (!preserve_times || S_ISLNK(st->st_mode))
 		flags |= PERMS_SKIP_MTIME;
-	if (!(flags & PERMS_SKIP_MTIME)
-	    && cmp_modtime(st->st_mtime, file->modtime) != 0) {
+	if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
+		flags |= PERMS_SKIP_ATIME;
+	if (!(flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))) {
+		time_t atime, mtime;
+
+		if (!(flags & PERMS_SKIP_ATIME)
+		    && cmp_time(st->st_atime, file->atime) != 0) {
+			atime = file->atime;
+			updated = 1;
+		} else
+			atime = st->st_atime;
+		if (!(flags & PERMS_SKIP_MTIME)
+		    && cmp_time(st->st_mtime, file->modtime) != 0) {
+			mtime = file->modtime;
+			updated = 1;
+		} else
+			mtime = st->st_mtime;
 		/* don't complain about not setting times on directories
 		 * because some filesystems can't do it */
-		if (set_modtime(fname,file->modtime) != 0 &&
+		if (updated && set_times(fname, mtime, atime) != 0 &&
 		    !S_ISDIR(st->st_mode)) {
 			rprintf(FERROR, "failed to set times on %s: %s\n",
 				full_fname(fname), strerror(errno));
 			return 0;
 		}
-		updated = 1;
 	}
 
 	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
--- rsync.h	13 May 2004 18:51:22 -0000	1.203
+++ rsync.h	13 May 2004 18:54:04 -0000
@@ -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)
 
 /* These flags are used in the live flist data. */
 
@@ -111,6 +112,7 @@
 
 #define PERMS_REPORT		(1<<0)
 #define PERMS_SKIP_MTIME	(1<<1)
+#define PERMS_SKIP_ATIME	(1<<2)
 
 #define FULL_FLUSH	1
 #define NORMAL_FLUSH	0
@@ -422,6 +424,7 @@ struct file_struct {
 		struct hlink *links;
 	} link_u;
 	time_t modtime;
+	time_t atime;
 	uid_t uid;
 	gid_t gid;
 	mode_t mode;
--- rsync.yo	7 May 2004 00:18:37 -0000	1.169
+++ rsync.yo	13 May 2004 18:54:05 -0000
@@ -299,6 +299,7 @@ verb(
  -g, --group                 preserve group
  -D, --devices               preserve devices (root only)
  -t, --times                 preserve times
+ -A, --copy-atimes           copy access times
  -S, --sparse                handle sparse files efficiently
  -n, --dry-run               show what would have been transferred
  -W, --whole-file            copy whole files, no incremental checks
@@ -545,6 +546,11 @@ modified cannot be effective; in other w
 cause the next transfer to behave as if it used -I, and all files will have
 their checksums compared and show up in log messages even if they haven't
 changed.
+
+dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
+along with the files and update them on the remote system.  Note that
+reading the source file may update the atime and hence repeated rsync
+copies with --copy-atimes may copy files unnecessarily.
 
 dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
 instead it will just report the actions it would have taken.
--- tls.c	9 Apr 2004 20:22:44 -0000	1.19
+++ tls.c	13 May 2004 18:54:05 -0000
@@ -39,6 +39,7 @@
 
 
 #include "rsync.h"
+#include "popt.h"
 
 #define PROGRAM "tls"
 
@@ -48,6 +49,7 @@ 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)
@@ -57,14 +59,29 @@ static void failed (char const *what,
 	exit (1);
 }
 
+static void storetime(char *dest, time_t t)
+{
+	if (t) {
+		struct tm *mt = gmtime(&t);
 
+		sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
+			mt->tm_year + 1900,
+			mt->tm_mon + 1,
+			mt->tm_mday,
+			mt->tm_hour,
+			mt->tm_min,
+			mt->tm_sec);
+	} else {
+		strcpy(dest, "                    ");
+	}
+}	
 
 static void list_file (const char *fname)
 {
 	STRUCT_STAT buf;
 	char permbuf[PERMSTRING_SIZE];
-	struct tm *mt;
-	char datebuf[50];
+	char mtimebuf[50];
+	char atimebuf[50];
 	char linkbuf[4096];
 
 	if (do_lstat(fname, &buf) == -1)
@@ -97,19 +114,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",
-			mt->tm_year + 1900,
-			mt->tm_mon + 1,
-			mt->tm_mday,
-			mt->tm_hour,
-			mt->tm_min,
-			mt->tm_sec);
-	} else {
-		strcpy(datebuf, "                   ");
-	}
+	storetime(mtimebuf, buf.st_mtime);
+	storetime(atimebuf, buf.st_atime);
 
 	/* TODO: Perhaps escape special characters in fname? */
 
@@ -120,24 +126,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);
-	printf(" %6ld.%-6ld %6ld %s %s%s\n",
+	printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
 	       (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
-	       datebuf, fname, linkbuf);
+ 	       mtimebuf, display_atime ? atimebuf : "",
+	       fname, linkbuf);
 }
 
+static struct poptOption long_options[] = {
+  /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
+  {"atime",           'u', POPT_ARG_NONE,   &display_atime, 0,   0, 0},
+  {"help",            'h', POPT_ARG_NONE,   0,              'h', 0, 0},
+  {0,0,0,0,0,0,0}
+};
+
+static void tls_usage(int ret)
+{
+	fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
+	    "Trivial file listing program for portably checking rsync\n");
+	exit(ret);
+}
 
 int
 main(int argc, char *argv[])
 {
-	if (argc < 2) {
-		fprintf (stderr, "usage: " PROGRAM " DIR ...\n"
-			 "Trivial file listing program for portably checking rsync\n");
-		return 1;
+	poptContext pc;
+	const char **extra_args;
+	int opt;
+
+	pc = poptGetContext(PROGRAM, argc, (const char **)argv,
+			    long_options, 0);
+	while ((opt = poptGetNextOpt(pc)) != -1) {
+		switch (opt) {
+		case 'h':
+			tls_usage(0);
+		default:
+			fprintf(stderr,
+			        "%s: %s\n",
+				poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+				poptStrerror(opt));
+			tls_usage(1);
+		}
 	}
 
-	for (argv++; *argv; argv++) {
-		list_file (*argv);
-	}
+	extra_args = poptGetArgs(pc);
+	if (*extra_args == NULL)
+		tls_usage(1);
+
+	for (; *extra_args; extra_args++)
+		list_file(*extra_args);
+	poptFreeContext(pc);
 
 	return 0;
 }
--- util.c	8 May 2004 20:03:39 -0000	1.142
+++ util.c	13 May 2004 18:54:05 -0000
@@ -124,32 +124,40 @@ void overflow(char *str)
 
 
-int set_modtime(char *fname, time_t modtime)
+int set_times(char *fname, time_t modtime, time_t atime)
 {
 	extern int dry_run;
 	if (dry_run)
 		return 0;
 
 	if (verbose > 2) {
-		rprintf(FINFO, "set modtime of %s to (%ld) %s",
+		char mtimebuf[200];
+		char atimebuf[200];
+
+		strlcpy(mtimebuf, timestring(modtime), sizeof(mtimebuf));
+		strlcpy(atimebuf, timestring(atime), sizeof(atimebuf));
+
+		rprintf(FINFO,
+			"set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
 			fname, (long) modtime,
-			asctime(localtime(&modtime)));
+			mtimebuf,
+			(long) atime, atimebuf);
 	}
 
 	{
 #ifdef HAVE_UTIMBUF
 		struct utimbuf tbuf;
-		tbuf.actime = time(NULL);
+		tbuf.actime = atime;
 		tbuf.modtime = modtime;
 		return utime(fname,&tbuf);
 #elif defined(HAVE_UTIME)
 		time_t t[2];
-		t[0] = time(NULL);
+		t[0] = atime;
 		t[1] = modtime;
 		return utime(fname,t);
 #else
 		struct timeval t[2];
-		t[0].tv_sec = time(NULL);
+		t[0].tv_sec = atime;
 		t[0].tv_usec = 0;
 		t[1].tv_sec = modtime;
 		t[1].tv_usec = 0;
@@ -1063,8 +1071,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
@@ -1073,7 +1081,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)
 {
 	extern int modify_window;
 
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ testsuite/copy-atimes.test	13 May 2004 18:54:05 -0000
@@ -0,0 +1,22 @@
+#! /bin/sh
+
+# Test rsync copying atimes
+
+. $srcdir/testsuite/rsync.fns
+
+set -x
+
+fromdir="$scratchdir/from"
+todir="$scratchdir/to"
+
+mkdir "$fromdir"
+
+touch "$fromdir/foo"
+touch -a -t 200102031717.42 "$fromdir/foo"
+
+TLS_ARGS=--atime
+
+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0
--- testsuite/rsync.fns	4 Feb 2004 07:32:48 -0000	1.59
+++ testsuite/rsync.fns	13 May 2004 18:54:05 -0000
@@ -51,7 +51,7 @@ printmsg() {
 
 
 rsync_ls_lR() {
-    find "$@" -print | sort | xargs "$TOOLDIR/tls"
+    find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS
 }
 
 rsync_getgroups() { 
@@ -151,6 +151,8 @@ checkit() {
     # We can just write everything to stdout/stderr, because the
     # wrapper hides it unless there is a problem.
 
+    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
+
     echo "Running: \"$1\""  
     eval "$1" 
     status=$?
@@ -159,6 +161,12 @@ checkit() {
     fi
 
     echo "-------------"
+    echo "check how the directory listings compare with diff:"
+    echo ""
+    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
+    diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
+
+    echo "-------------"
     echo "check how the files compare with diff:"
     echo ""
     for f in `cd "$2"; find . -type f -print `
@@ -166,12 +174,6 @@ checkit() {
         diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
     done
 
-    echo "-------------"
-    echo "check how the directory listings compare with diff:"
-    echo ""
-    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
-    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
-    diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
     if [ -z "${failed}" ] ; then
 	return 0
     else
Commit	Line	Data
8a529471 WD	1	After applying this patch and running configure, you MUST run this
	2	command before "make":
	3
	4	make proto
	5
	6
43581f16	7	--- batch.c 6 Mar 2004 07:45:52 -0000 1.31
8a529471	8	+++ batch.c 13 May 2004 18:54:03 -0000
43581f16 WD	9	@@ -342,6 +342,8 @@ void show_flist(int index, struct file_s
	10	rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
	11	rprintf(FINFO, "flist->modtime=%#lx\n",
	12	(long unsigned) fptr[i]->modtime);
	13	+ rprintf(FINFO, "flist->atime=%#lx\n",
	14	+ (long unsigned) fptr[i]->atime);
	15	rprintf(FINFO, "flist->length=%.0f\n",
	16	(double) fptr[i]->length);
	17	rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
8a529471 WD	18	--- flist.c 11 May 2004 17:25:16 -0000 1.221
	19	+++ flist.c 13 May 2004 18:54:03 -0000
	20	@@ -57,6 +57,7 @@ extern int relative_paths;
43581f16 WD	21	extern int implied_dirs;
	22	extern int copy_links;
	23	extern int copy_unsafe_links;
	24	+extern int copy_atimes;
	25	extern int protocol_version;
	26	extern int sanitize_paths;
	27
8a529471	28	@@ -139,16 +140,16 @@ static void list_file_entry(struct file_
43581f16 WD	29
	30	#if SUPPORT_LINKS
	31	if (preserve_links && S_ISLNK(f->mode)) {
	32	- rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
	33	+ rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
	34	perms,
	35	(double) f->length, timestring(f->modtime),
	36	- f_name(f), f->u.link);
	37	+ timestring(f->atime), f_name(f), f->u.link);
	38	} else
	39	#endif
	40	- rprintf(FINFO, "%s %11.0f %s %s\n",
	41	+ rprintf(FINFO, "%s %11.0f %s %s %s\n",
	42	perms,
	43	(double) f->length, timestring(f->modtime),
	44	- f_name(f));
	45	+ timestring(f->atime), f_name(f));
	46	}
	47
	48
8a529471	49	@@ -325,6 +326,7 @@ void send_file_entry(struct file_struct
43581f16 WD	50	{
	51	unsigned short flags;
	52	static time_t modtime;
	53	+ static time_t atime;
	54	static mode_t mode;
	55	static uint64 dev;
	56	static dev_t rdev;
8a529471	57	@@ -340,7 +342,7 @@ void send_file_entry(struct file_struct
43581f16 WD	58
	59	if (!file) {
	60	write_byte(f, 0);
	61	- modtime = 0, mode = 0;
	62	+ modtime = 0, atime = 0, mode = 0;
	63	dev = 0, rdev = makedev(0, 0);
	64	rdev_major = 0;
	65	uid = 0, gid = 0;
8a529471	66	@@ -389,6 +391,12 @@ void send_file_entry(struct file_struct
43581f16 WD	67	flags \|= XMIT_SAME_TIME;
	68	else
	69	modtime = file->modtime;
	70	+ if (copy_atimes && !S_ISDIR(mode)) {
	71	+ if (file->atime == atime)
	72	+ flags \|= XMIT_SAME_ATIME;
	73	+ else
	74	+ atime = file->atime;
	75	+ }
	76
	77	#if SUPPORT_HARD_LINKS
	78	if (file->link_u.idev) {
8a529471	79	@@ -444,6 +452,8 @@ void send_file_entry(struct file_struct
43581f16 WD	80	write_int(f, modtime);
	81	if (!(flags & XMIT_SAME_MODE))
	82	write_int(f, to_wire_mode(mode));
	83	+ if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
	84	+ write_int(f, atime);
	85	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
	86	if (!numeric_ids)
	87	add_uid(uid);
8a529471	88	@@ -517,6 +527,7 @@ void receive_file_entry(struct file_stru
43581f16 WD	89	struct file_list *flist, int f)
	90	{
	91	static time_t modtime;
	92	+ static time_t atime;
	93	static mode_t mode;
	94	static uint64 dev;
	95	static dev_t rdev;
8a529471	96	@@ -533,7 +544,7 @@ void receive_file_entry(struct file_stru
43581f16 WD	97	struct file_struct *file;
	98
	99	if (!fptr) {
	100	- modtime = 0, mode = 0;
	101	+ modtime = 0, atime = 0, mode = 0;
	102	dev = 0, rdev = makedev(0, 0);
	103	rdev_major = 0;
	104	uid = 0, gid = 0;
8a529471	105	@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru
43581f16 WD	106	modtime = (time_t)read_int(f);
	107	if (!(flags & XMIT_SAME_MODE))
	108	mode = from_wire_mode(read_int(f));
	109	+ if (copy_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
	110	+ atime = (time_t)read_int(f);
	111
	112	if (preserve_uid && !(flags & XMIT_SAME_UID))
	113	uid = (uid_t)read_int(f);
8a529471	114	@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru
43581f16 WD	115
	116	file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
	117	file->modtime = modtime;
	118	+ file->atime = atime;
	119	file->length = file_length;
	120	file->mode = mode;
	121	file->uid = uid;
8a529471	122	@@ -852,6 +866,7 @@ skip_excludes:
43581f16 WD	123
	124	file->flags = flags;
	125	file->modtime = st.st_mtime;
	126	+ file->atime = st.st_atime;
	127	file->length = st.st_size;
	128	file->mode = st.st_mode;
	129	file->uid = st.st_uid;
8a529471 WD	130	--- generator.c 13 May 2004 06:55:01 -0000 1.82
8a529471 WD	131	+++ generator.c 13 May 2004 18:54:03 -0000
ea238f1c	132	@@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
43581f16 WD	133	return 0;
	134	}
	135
	136	- return (cmp_modtime(st->st_mtime,file->modtime) == 0);
	137	+ return cmp_time(st->st_mtime,file->modtime) == 0;
	138	}
	139
	140
8a529471	141	@@ -466,7 +466,7 @@ void recv_generator(char *fname, struct
43581f16 WD	142	return;
	143	}
	144
	145	- if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
	146	+ if (update_only && cmp_time(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
	147	if (verbose > 1)
	148	rprintf(FINFO,"%s is newer\n",fname);
	149	return;
ea238f1c	150	--- options.c 6 May 2004 21:08:01 -0000 1.148
8a529471	151	+++ options.c 13 May 2004 18:54:04 -0000
43581f16 WD	152	@@ -46,6 +46,7 @@ int preserve_devices = 0;
	153	int preserve_uid = 0;
	154	int preserve_gid = 0;
	155	int preserve_times = 0;
	156	+int copy_atimes = 0;
	157	int update_only = 0;
	158	int cvs_exclude = 0;
	159	int dry_run = 0;
	160	@@ -241,6 +242,7 @@ void usage(enum logcode F)
	161	rprintf(F," -g, --group preserve group\n");
	162	rprintf(F," -D, --devices preserve devices (root only)\n");
	163	rprintf(F," -t, --times preserve times\n");
	164	+ rprintf(F," -A, --copy-atimes copy access times\n");
	165	rprintf(F," -S, --sparse handle sparse files efficiently\n");
	166	rprintf(F," -n, --dry-run show what would have been transferred\n");
	167	rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
	168	@@ -346,6 +348,7 @@ static struct poptOption long_options[]
	169	{"group", 'g', POPT_ARG_NONE, &preserve_gid, 0, 0, 0 },
	170	{"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 },
	171	{"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 },
	172	+ {"copy-atimes", 'A', POPT_ARG_NONE, &copy_atimes, 0, 0, 0 },
	173	{"checksum", 'c', POPT_ARG_NONE, &always_checksum, 0, 0, 0 },
	174	{"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
	175	{"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
	176	@@ -823,6 +826,8 @@ void server_options(char *args,int arg
	177	argstr[x++] = 'D';
	178	if (preserve_times)
	179	argstr[x++] = 't';
	180	+ if (copy_atimes)
	181	+ argstr[x++] = 'A';
	182	if (preserve_perms)
	183	argstr[x++] = 'p';
	184	if (recurse)
8a529471 WD	185	--- rsync.c 13 May 2004 18:51:22 -0000 1.138
8a529471 WD	186	+++ rsync.c 13 May 2004 18:54:04 -0000
43581f16 WD	187	@@ -25,6 +25,7 @@
	188	extern int verbose;
	189	extern int dry_run;
	190	extern int preserve_times;
	191	+extern int copy_atimes;
	192	extern int am_root;
43581f16	193	extern int am_sender;
8a529471 WD	194	extern int am_generator;
	195	@@ -140,17 +141,31 @@ int set_perms(char *fname,struct file_st
	196
	197	if (!preserve_times \|\| S_ISLNK(st->st_mode))
	198	flags \|= PERMS_SKIP_MTIME;
	199	- if (!(flags & PERMS_SKIP_MTIME)
	200	- && cmp_modtime(st->st_mtime, file->modtime) != 0) {
	201	+ if (!copy_atimes \|\| S_ISLNK(st->st_mode) \|\| S_ISDIR(st->st_mode))
	202	+ flags \|= PERMS_SKIP_ATIME;
	203	+ if (!(flags & (PERMS_SKIP_MTIME\|PERMS_SKIP_ATIME))) {
43581f16 WD	204	+ time_t atime, mtime;
43581f16 WD	205	+
8a529471	206	+ if (!(flags & PERMS_SKIP_ATIME)
43581f16 WD	207	+ && cmp_time(st->st_atime, file->atime) != 0) {
	208	+ atime = file->atime;
	209	+ updated = 1;
	210	+ } else
	211	+ atime = st->st_atime;
8a529471 WD	212	+ if (!(flags & PERMS_SKIP_MTIME)
8a529471 WD	213	+ && cmp_time(st->st_mtime, file->modtime) != 0) {
43581f16 WD	214	+ mtime = file->modtime;
	215	+ updated = 1;
	216	+ } else
	217	+ mtime = st->st_mtime;
	218	/* don't complain about not setting times on directories
	219	* because some filesystems can't do it */
	220	- if (set_modtime(fname,file->modtime) != 0 &&
	221	+ if (updated && set_times(fname, mtime, atime) != 0 &&
	222	!S_ISDIR(st->st_mode)) {
	223	rprintf(FERROR, "failed to set times on %s: %s\n",
	224	full_fname(fname), strerror(errno));
	225	return 0;
	226	}
	227	- updated = 1;
	228	}
	229
	230	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
8a529471 WD	231	--- rsync.h 13 May 2004 18:51:22 -0000 1.203
8a529471 WD	232	+++ rsync.h 13 May 2004 18:54:04 -0000
43581f16 WD	233	@@ -54,6 +54,7 @@
	234	#define XMIT_HAS_IDEV_DATA (1<<9)
	235	#define XMIT_SAME_DEV (1<<10)
	236	#define XMIT_RDEV_MINOR_IS_SMALL (1<<11)
	237	+#define XMIT_SAME_ATIME (1<<12)
	238
	239	/* These flags are used in the live flist data. */
	240
8a529471 WD	241	@@ -111,6 +112,7 @@
	242
	243	#define PERMS_REPORT (1<<0)
	244	#define PERMS_SKIP_MTIME (1<<1)
	245	+#define PERMS_SKIP_ATIME (1<<2)
	246
	247	#define FULL_FLUSH 1
	248	#define NORMAL_FLUSH 0
	249	@@ -422,6 +424,7 @@ struct file_struct {
43581f16 WD	250	struct hlink *links;
	251	} link_u;
	252	time_t modtime;
	253	+ time_t atime;
	254	uid_t uid;
	255	gid_t gid;
	256	mode_t mode;
ea238f1c	257	--- rsync.yo 7 May 2004 00:18:37 -0000 1.169
8a529471	258	+++ rsync.yo 13 May 2004 18:54:05 -0000
43581f16 WD	259	@@ -299,6 +299,7 @@ verb(
	260	-g, --group preserve group
	261	-D, --devices preserve devices (root only)
	262	-t, --times preserve times
	263	+ -A, --copy-atimes copy access times
	264	-S, --sparse handle sparse files efficiently
	265	-n, --dry-run show what would have been transferred
	266	-W, --whole-file copy whole files, no incremental checks
ea238f1c	267	@@ -545,6 +546,11 @@ modified cannot be effective; in other w
43581f16 WD	268	cause the next transfer to behave as if it used -I, and all files will have
	269	their checksums compared and show up in log messages even if they haven't
	270	changed.
	271	+
	272	+dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
	273	+along with the files and update them on the remote system. Note that
	274	+reading the source file may update the atime and hence repeated rsync
	275	+copies with --copy-atimes may copy files unnecessarily.
	276
	277	dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
	278	instead it will just report the actions it would have taken.
	279	--- tls.c 9 Apr 2004 20:22:44 -0000 1.19
8a529471	280	+++ tls.c 13 May 2004 18:54:05 -0000
43581f16 WD	281	@@ -39,6 +39,7 @@
	282
	283
	284	#include "rsync.h"
	285	+#include "popt.h"
	286
	287	#define PROGRAM "tls"
	288
	289	@@ -48,6 +49,7 @@ int read_only = 1;
	290	int list_only = 0;
	291	int preserve_perms = 0;
	292
	293	+static int display_atime = 0;
	294
	295	static void failed (char const *what,
	296	char const *where)
	297	@@ -57,14 +59,29 @@ static void failed (char const *what,
	298	exit (1);
	299	}
	300
	301	+static void storetime(char *dest, time_t t)
	302	+{
	303	+ if (t) {
	304	+ struct tm *mt = gmtime(&t);
	305
	306	+ sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
	307	+ mt->tm_year + 1900,
	308	+ mt->tm_mon + 1,
	309	+ mt->tm_mday,
	310	+ mt->tm_hour,
	311	+ mt->tm_min,
	312	+ mt->tm_sec);
	313	+ } else {
	314	+ strcpy(dest, " ");
	315	+ }
	316	+}
	317
	318	static void list_file (const char *fname)
	319	{
	320	STRUCT_STAT buf;
	321	char permbuf[PERMSTRING_SIZE];
	322	- struct tm *mt;
	323	- char datebuf[50];
	324	+ char mtimebuf[50];
	325	+ char atimebuf[50];
	326	char linkbuf[4096];
	327
	328	if (do_lstat(fname, &buf) == -1)
	329	@@ -97,19 +114,8 @@ static void list_file (const char *fname
	330
	331	permstring(permbuf, buf.st_mode);
	332
	333	- if (buf.st_mtime) {
	334	- mt = gmtime(&buf.st_mtime);
	335	-
	336	- sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d",
	337	- mt->tm_year + 1900,
	338	- mt->tm_mon + 1,
	339	- mt->tm_mday,
	340	- mt->tm_hour,
	341	- mt->tm_min,
	342	- mt->tm_sec);
	343	- } else {
	344	- strcpy(datebuf, " ");
345	- }
346	+ storetime(mtimebuf, buf.st_mtime);
347	+ storetime(atimebuf, buf.st_atime);
348
349	/* TODO: Perhaps escape special characters in fname? */
350
351	@@ -120,24 +126,55 @@ static void list_file (const char *fname
352	(long)minor(buf.st_rdev));
353	} else /* NB: use double for size since it might not fit in a long. */
354	printf("%12.0f", (double)buf.st_size);
355	- printf(" %6ld.%-6ld %6ld %s %s%s\n",
356	+ printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
357	(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
358	- datebuf, fname, linkbuf);
359	+ mtimebuf, display_atime ? atimebuf : "",
360	+ fname, linkbuf);
361	}
362
363	+static struct poptOption long_options[] = {
364	+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
365	+ {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
366	+ {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0},
367	+ {0,0,0,0,0,0,0}
368	+};
369	+
370	+static void tls_usage(int ret)
371	+{
372	+ fprintf(stderr, "usage: " PROGRAM " [--atime \| -u] DIR ...\n"
373	+ "Trivial file listing program for portably checking rsync\n");
374	+ exit(ret);
375	+}
376
377	int
378	main(int argc, char *argv[])
379	{
380	- if (argc < 2) {
381	- fprintf (stderr, "usage: " PROGRAM " DIR ...\n"
382	- "Trivial file listing program for portably checking rsync\n");
383	- return 1;
384	+ poptContext pc;
385	+ const char **extra_args;
386	+ int opt;
387	+
388	+ pc = poptGetContext(PROGRAM, argc, (const char **)argv,
389	+ long_options, 0);
390	+ while ((opt = poptGetNextOpt(pc)) != -1) {
391	+ switch (opt) {
392	+ case 'h':
393	+ tls_usage(0);
394	+ default:
395	+ fprintf(stderr,
396	+ "%s: %s\n",
397	+ poptBadOption(pc, POPT_BADOPTION_NOALIAS),
398	+ poptStrerror(opt));
399	+ tls_usage(1);
400	+ }
401	}
402
403	- for (argv++; *argv; argv++) {
404	- list_file (*argv);
405	- }
406	+ extra_args = poptGetArgs(pc);
407	+ if (*extra_args == NULL)
408	+ tls_usage(1);
409	+
410	+ for (; *extra_args; extra_args++)
411	+ list_file(*extra_args);
412	+ poptFreeContext(pc);
413
414	return 0;
415	}
8a529471 WD	416	--- util.c 8 May 2004 20:03:39 -0000 1.142
8a529471 WD	417	+++ util.c 13 May 2004 18:54:05 -0000
43581f16 WD	418	@@ -124,32 +124,40 @@ void overflow(char *str)
	419
	420
	421
	422	-int set_modtime(char *fname, time_t modtime)
	423	+int set_times(char *fname, time_t modtime, time_t atime)
	424	{
	425	extern int dry_run;
	426	if (dry_run)
	427	return 0;
	428
	429	if (verbose > 2) {
	430	- rprintf(FINFO, "set modtime of %s to (%ld) %s",
	431	+ char mtimebuf[200];
	432	+ char atimebuf[200];
	433	+
	434	+ strlcpy(mtimebuf, timestring(modtime), sizeof(mtimebuf));
	435	+ strlcpy(atimebuf, timestring(atime), sizeof(atimebuf));
	436	+
	437	+ rprintf(FINFO,
	438	+ "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
	439	fname, (long) modtime,
	440	- asctime(localtime(&modtime)));
	441	+ mtimebuf,
	442	+ (long) atime, atimebuf);
	443	}
	444
	445	{
	446	#ifdef HAVE_UTIMBUF
	447	struct utimbuf tbuf;
	448	- tbuf.actime = time(NULL);
	449	+ tbuf.actime = atime;
	450	tbuf.modtime = modtime;
	451	return utime(fname,&tbuf);
	452	#elif defined(HAVE_UTIME)
	453	time_t t[2];
	454	- t[0] = time(NULL);
	455	+ t[0] = atime;
	456	t[1] = modtime;
	457	return utime(fname,t);
	458	#else
	459	struct timeval t[2];
	460	- t[0].tv_sec = time(NULL);
	461	+ t[0].tv_sec = atime;
	462	t[0].tv_usec = 0;
	463	t[1].tv_sec = modtime;
	464	t[1].tv_usec = 0;
8a529471	465	@@ -1063,8 +1071,8 @@ int msleep(int t)
43581f16 WD	466
	467
	468	/**
	469	- * Determine if two file modification times are equivalent (either
	470	- * exact or in the modification timestamp window established by
	471	+ * Determine if two file times are equivalent (either
	472	+ * exact or in the timestamp window established by
	473	* --modify-window).
	474	*
	475	* @retval 0 if the times should be treated as the same
8a529471	476	@@ -1073,7 +1081,7 @@ int msleep(int t)
43581f16 WD	477	*
	478	* @retval -1 if the 2nd is later
	479	**/
	480	-int cmp_modtime(time_t file1, time_t file2)
	481	+int cmp_time(time_t file1, time_t file2)
	482	{
	483	extern int modify_window;
	484
	485	--- /dev/null 1 Jan 1970 00:00:00 -0000
8a529471	486	+++ testsuite/copy-atimes.test 13 May 2004 18:54:05 -0000
43581f16 WD	487	@@ -0,0 +1,22 @@
	488	+#! /bin/sh
	489	+
	490	+# Test rsync copying atimes
	491	+
	492	+. $srcdir/testsuite/rsync.fns
	493	+
	494	+set -x
	495	+
	496	+fromdir="$scratchdir/from"
	497	+todir="$scratchdir/to"
	498	+
	499	+mkdir "$fromdir"
	500	+
	501	+touch "$fromdir/foo"
	502	+touch -a -t 200102031717.42 "$fromdir/foo"
	503	+
	504	+TLS_ARGS=--atime
	505	+
	506	+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
	507	+
	508	+# The script would have aborted on error, so getting here means we've won.
	509	+exit 0
	510	--- testsuite/rsync.fns 4 Feb 2004 07:32:48 -0000 1.59
8a529471	511	+++ testsuite/rsync.fns 13 May 2004 18:54:05 -0000
43581f16 WD	512	@@ -51,7 +51,7 @@ printmsg() {
	513
	514
	515	rsync_ls_lR() {
	516	- find "$@" -print \| sort \| xargs "$TOOLDIR/tls"
	517	+ find "$@" -print \| sort \| xargs "$TOOLDIR/tls" $TLS_ARGS
	518	}
	519
	520	rsync_getgroups() {
	521	@@ -151,6 +151,8 @@ checkit() {
	522	# We can just write everything to stdout/stderr, because the
	523	# wrapper hides it unless there is a problem.
	524
	525	+ ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from
	526	+
	527	echo "Running: \"$1\""
	528	eval "$1"
	529	status=$?
	530	@@ -159,6 +161,12 @@ checkit() {
	531	fi
	532
	533	echo "-------------"
	534	+ echo "check how the directory listings compare with diff:"
	535	+ echo ""
	536	+ ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to
	537	+ diff $diffopt ${TMP}/ls-from ${TMP}/ls-to \|\| failed=YES
	538	+
	539	+ echo "-------------"
	540	echo "check how the files compare with diff:"
	541	echo ""
	542	for f in `cd "$2"; find . -type f -print `
	543	@@ -166,12 +174,6 @@ checkit() {
	544	diff $diffopt "$2"/"$f" "$3"/"$f" \|\| failed=YES
	545	done
	546
	547	- echo "-------------"
	548	- echo "check how the directory listings compare with diff:"
	549	- echo ""
	550	- ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from
	551	- ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to
	552	- diff $diffopt ${TMP}/ls-from ${TMP}/ls-to \|\| failed=YES
	553	if [ -z "${failed}" ] ; then
	554	return 0
	555	else