I posted a patch a few days ago that adds copying of atime. At that
time, it was just enabled with -t/--times. After some time, we have
figured out that that choice might not have been the best. Here's a
new version of the patch (relative to CVS) that adds -A/--copy-atime
instead. It also includes a test case.
Any feedback on this patch and/or the previous one that I posted?
-------------- next part --------------
Index: backup.c
==================================================================RCS file:
/cvsroot/rsync/backup.c,v
retrieving revision 1.28
diff -u -w -r1.28 backup.c
--- backup.c 13 Mar 2004 20:18:03 -0000 1.28
+++ backup.c 20 Apr 2004 21:06:17 -0000
@@ -101,7 +101,7 @@
"make_bak_dir stat %s failed: %s\n",
full_fname(rel), strerror(errno));
} else {
- set_modtime(fullpath, st.st_mtime);
+ set_times(fullpath, st.st_mtime, time(NULL));
do_lchown(fullpath, st.st_uid, st.st_gid);
do_chmod(fullpath, st.st_mode);
}
Index: batch.c
==================================================================RCS file:
/cvsroot/rsync/batch.c,v
retrieving revision 1.31
diff -u -w -r1.31 batch.c
--- batch.c 6 Mar 2004 07:45:52 -0000 1.31
+++ batch.c 20 Apr 2004 21:06:17 -0000
@@ -342,6 +342,8 @@
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);
Index: flist.c
==================================================================RCS file:
/cvsroot/rsync/flist.c,v
retrieving revision 1.214
diff -u -w -r1.214 flist.c
--- flist.c 17 Apr 2004 17:14:12 -0000 1.214
+++ flist.c 20 Apr 2004 21:06:18 -0000
@@ -140,16 +140,16 @@
#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));
}
@@ -326,6 +326,7 @@
{
unsigned short flags;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
static uint64 dev;
static dev_t rdev;
@@ -341,7 +342,7 @@
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;
@@ -390,6 +391,12 @@
flags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
+ if (protocol_version > 28) {
+ if (file->atime == atime)
+ flags |= XMIT_SAME_ATIME;
+ else
+ atime = file->atime;
+ }
#if SUPPORT_HARD_LINKS
if (file->link_u.idev) {
@@ -443,6 +450,8 @@
write_longint(f, file->length);
if (!(flags & XMIT_SAME_TIME))
write_int(f, modtime);
+ if (protocol_version > 28 && !(flags & XMIT_SAME_ATIME))
+ write_int(f, atime);
if (!(flags & XMIT_SAME_MODE))
write_int(f, to_wire_mode(mode));
if (preserve_uid && !(flags & XMIT_SAME_UID)) {
@@ -518,6 +527,7 @@
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;
@@ -534,7 +544,7 @@
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;
@@ -586,6 +596,11 @@
file_length = read_longint(f);
if (!(flags & XMIT_SAME_TIME))
modtime = (time_t)read_int(f);
+ if (protocol_version > 28) {
+ if (!(flags & XMIT_SAME_ATIME))
+ atime = (time_t)read_int(f);
+ } else
+ atime = time(NULL);
if (!(flags & XMIT_SAME_MODE))
mode = from_wire_mode(read_int(f));
@@ -638,6 +653,7 @@
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 +868,7 @@
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;
Index: generator.c
==================================================================RCS file:
/cvsroot/rsync/generator.c,v
retrieving revision 1.79
diff -u -w -r1.79 generator.c
--- generator.c 15 Apr 2004 16:55:23 -0000 1.79
+++ generator.c 20 Apr 2004 21:06:18 -0000
@@ -50,6 +50,7 @@
extern int only_existing;
extern int orig_umask;
extern int safe_symlinks;
+extern int copy_atimes;
/* choose whether to skip a particular file */
@@ -97,7 +98,11 @@
return 0;
}
- return (cmp_modtime(st->st_mtime,file->modtime) == 0);
+ if (copy_atimes && cmp_time(st->st_atime,file->atime) !=
0) {
+ return 0;
+ }
+
+ return (cmp_time(st->st_mtime,file->modtime) == 0);
}
@@ -464,7 +469,7 @@
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;
Index: options.c
==================================================================RCS file:
/cvsroot/rsync/options.c,v
retrieving revision 1.147
diff -u -w -r1.147 options.c
--- options.c 17 Apr 2004 17:07:23 -0000 1.147
+++ options.c 20 Apr 2004 21:06:18 -0000
@@ -46,6 +46,7 @@
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 @@
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 @@
{"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, ©_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 @@
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
+ if (copy_atimes)
+ argstr[x++] = 'A';
if (preserve_perms)
argstr[x++] = 'p';
if (recurse)
Index: proto.h
==================================================================RCS file:
/cvsroot/rsync/proto.h,v
retrieving revision 1.188
diff -u -w -r1.188 proto.h
--- proto.h 14 Apr 2004 23:33:30 -0000 1.188
+++ proto.h 20 Apr 2004 21:06:18 -0000
@@ -243,7 +243,7 @@
void print_child_argv(char **cmd);
void out_of_memory(char *str);
void overflow(char *str);
-int set_modtime(char *fname, time_t modtime);
+int set_times(char *fname, time_t modtime, time_t atime);
int create_directory_path(char *fname, int base_umask);
int copy_file(char *source, char *dest, mode_t mode);
int robust_unlink(char *fname);
@@ -267,7 +267,7 @@
int unsafe_symlink(const char *dest, const char *src);
char *timestring(time_t t);
int msleep(int t);
-int cmp_modtime(time_t file1, time_t file2);
+int cmp_time(time_t file1, time_t file2);
int _Insure_trap_error(int a1, int a2, int a3, int a4, int a5, int a6);
void *_new_array(unsigned int size, unsigned long num);
void *_realloc_array(void *ptr, unsigned int size, unsigned long num);
Index: rsync.1
==================================================================RCS file:
/cvsroot/rsync/rsync.1,v
retrieving revision 1.175
diff -u -w -r1.175 rsync.1
--- rsync.1 17 Apr 2004 18:40:16 -0000 1.175
+++ rsync.1 20 Apr 2004 21:06:19 -0000
@@ -336,6 +336,7 @@
-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
@@ -616,6 +617,12 @@
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\&.
+.IP
+.IP "\fB-A, --copy-atimes\fP"
+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\&.
.IP
.IP "\fB-n, --dry-run\fP"
This tells rsync to not do any file transfers,
Index: rsync.c
==================================================================RCS file:
/cvsroot/rsync/rsync.c,v
retrieving revision 1.135
diff -u -w -r1.135 rsync.c
--- rsync.c 23 Mar 2004 16:16:15 -0000 1.135
+++ rsync.c 20 Apr 2004 21:06:19 -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_server;
extern int am_sender;
@@ -140,18 +141,32 @@
st = &st2;
}
- if (preserve_times && !S_ISLNK(st->st_mode) &&
- cmp_modtime(st->st_mtime, file->modtime) != 0) {
+ if (!S_ISLNK(st->st_mode) && (preserve_times ||
copy_atimes)) {
+ time_t atime = time(NULL);
+ time_t mtime = atime;
+ int change = 0;
+
+ if (copy_atimes &&
+ cmp_time(st->st_atime, file->atime) != 0) {
+ atime = file->atime;
+ change = 1;
+ }
+ if (preserve_times &&
+ cmp_time(st->st_mtime, file->modtime) != 0) {
+ mtime = file->modtime;
+ change = 1;
+ }
/* don't complain about not setting times on directories
- * because some filesystems can't do it */
- if (set_modtime(fname,file->modtime) != 0 &&
+ because some filesystems can't do it */
+ if (change && 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;
- }
+ } else {
updated = 1;
}
+ }
change_uid = am_root && preserve_uid && st->st_uid !=
file->uid;
change_gid = preserve_gid && file->gid != GID_NONE
@@ -236,7 +251,7 @@
return;
/* move tmp file over real file */
- ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
+ ret = robust_rename(fnametmp, fname, 0600);
if (ret < 0) {
rprintf(FERROR, "%s %s -> \"%s\": %s\n",
ret == -2 ? "copy" : "rename",
Index: rsync.h
==================================================================RCS file:
/cvsroot/rsync/rsync.h,v
retrieving revision 1.197
diff -u -w -r1.197 rsync.h
--- rsync.h 17 Apr 2004 17:14:16 -0000 1.197
+++ rsync.h 20 Apr 2004 21:06:19 -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. */
@@ -62,7 +63,7 @@
#define FLAG_MOUNT_POINT (1<<2) /* sender only */
/* update this if you make incompatible changes */
-#define PROTOCOL_VERSION 28
+#define PROTOCOL_VERSION 29
/* We refuse to interoperate with versions that are not in this range.
* Note that we assume we'll work with later versions: the onus is on
@@ -419,6 +420,7 @@
struct hlink *links;
} link_u;
time_t modtime;
+ time_t atime;
uid_t uid;
gid_t gid;
mode_t mode;
Index: rsync.yo
==================================================================RCS file:
/cvsroot/rsync/rsync.yo,v
retrieving revision 1.159
diff -u -w -r1.159 rsync.yo
--- rsync.yo 17 Apr 2004 18:40:16 -0000 1.159
+++ rsync.yo 20 Apr 2004 21:06:20 -0000
@@ -299,6 +299,7 @@
-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
@@ -536,6 +537,11 @@
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.
Index: tls.c
==================================================================RCS file:
/cvsroot/rsync/tls.c,v
retrieving revision 1.19
diff -u -w -r1.19 tls.c
--- tls.c 9 Apr 2004 20:22:44 -0000 1.19
+++ tls.c 20 Apr 2004 21:06:20 -0000
@@ -39,6 +39,7 @@
#include "rsync.h"
+#include "popt.h"
#define PROGRAM "tls"
@@ -48,6 +49,7 @@
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,30 @@
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 +115,8 @@
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 +127,58 @@
(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%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
- datebuf, fname, linkbuf);
+ mtimebuf,
+ display_atime ? atimebuf : "",
+ display_atime ? "" : " ",
+ 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}
+};
+
+static void tls_usage()
+{
+ fprintf (stderr, "usage: " PROGRAM " [--atime | -u] DIR
...\n"
+ "Trivial file listing program for portably checking
rsync\n");
+}
int
main(int argc, char *argv[])
{
- if (argc < 2) {
- fprintf (stderr, "usage: " PROGRAM " DIR ...\n"
- "Trivial file listing program for portably checking rsync\n");
+ poptContext pc;
+ const char **extra_args;
+ char err_buf[100];
+ int opt;
+
+ pc = poptGetContext(PROGRAM, argc, (const char **)argv,
+ long_options, 0);
+ while ((opt = poptGetNextOpt(pc)) != -1) {
+ switch (opt) {
+ case 'h':
+ tls_usage();
+ return 0;
+ default :
+ snprintf(err_buf, sizeof err_buf,
+ "%s: %s\n",
+ poptBadOption(pc, POPT_BADOPTION_NOALIAS),
+ poptStrerror(opt));
return 1;
}
-
- for (argv++; *argv; argv++) {
- list_file (*argv);
}
+ extra_args = poptGetArgs(pc);
+ if (*extra_args == NULL) {
+ tls_usage();
+ return 1;
+ }
+ for (; *extra_args; extra_args++) {
+ list_file (*extra_args);
+ }
+ poptFreeContext(pc);
return 0;
}
Index: util.c
==================================================================RCS file:
/cvsroot/rsync/util.c,v
retrieving revision 1.136
diff -u -w -r1.136 util.c
--- util.c 17 Apr 2004 17:06:03 -0000 1.136
+++ util.c 20 Apr 2004 21:06:20 -0000
@@ -124,32 +124,40 @@
-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;
@@ -1052,8 +1060,8 @@
/**
- * 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
@@ -1062,7 +1070,7 @@
*
* @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;
Index: testsuite/atime.test
==================================================================RCS file:
testsuite/atime.test
diff -N testsuite/atime.test
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ testsuite/atime.test 20 Apr 2004 21:06:20 -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
Index: testsuite/rsync.fns
==================================================================RCS file:
/cvsroot/rsync/testsuite/rsync.fns,v
retrieving revision 1.59
diff -u -w -r1.59 rsync.fns
--- testsuite/rsync.fns 4 Feb 2004 07:32:48 -0000 1.59
+++ testsuite/rsync.fns 20 Apr 2004 21:06:20 -0000
@@ -51,7 +51,7 @@
rsync_ls_lR() {
- find "$@" -print | sort | xargs "$TOOLDIR/tls"
+ find "$@" -print | sort | xargs "$TOOLDIR/tls"
$TLS_ARGS
}
rsync_getgroups() {
@@ -151,6 +151,8 @@
# 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 @@
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 @@
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