---- backup.c 13 Mar 2004 20:18:03 -0000 1.28
-+++ backup.c 20 Apr 2004 23:44:16 -0000
-@@ -101,7 +101,7 @@ static int make_bak_dir(char *fullpath)
- "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);
- }
---- batch.c 6 Mar 2004 07:45:52 -0000 1.31
-+++ batch.c 20 Apr 2004 23:44:16 -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 17 Apr 2004 17:14:12 -0000 1.214
-+++ flist.c 20 Apr 2004 23:44:17 -0000
-@@ -58,6 +58,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;
-
-@@ -140,16 +141,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
+To use this patch, run these commands for a successful build:
+
+ patch -p1 <patches/atimes.diff
+ ./prepare-source
+ ./configure (optional if already run)
+ make
+
+TODO: need to fix this to handle 64-bit time_t values!
+
+--- old/compat.c
++++ new/compat.c
+@@ -44,6 +44,7 @@ extern int protocol_version;
+ extern int protect_args;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_atimes;
+ extern int preserve_acls;
+ extern int preserve_xattrs;
+ extern int need_messages_from_generator;
+@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv;
#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 +327,7 @@ void send_file_entry(struct file_struct
+ /* These index values are for the file-list's extra-attribute array. */
+-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
++int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx;
+ #ifdef ICONV_OPTION
+ int ic_ndx;
+
+@@ -112,6 +113,8 @@ void setup_protocol(int f_out,int f_in)
+ uid_ndx = ++file_extra_cnt;
+ if (preserve_gid)
+ gid_ndx = ++file_extra_cnt;
++ if (preserve_atimes)
++ atimes_ndx = ++file_extra_cnt;
+ if (preserve_acls && !am_sender)
+ acls_ndx = ++file_extra_cnt;
+ if (preserve_xattrs)
+--- old/flist.c
++++ new/flist.c
+@@ -53,6 +53,7 @@ extern int preserve_specials;
+ extern int uid_ndx;
+ extern int gid_ndx;
+ extern int eol_nulls;
++extern int atimes_ndx;
+ extern int relative_paths;
+ extern int implied_dirs;
+ extern int file_extra_cnt;
+@@ -334,6 +335,7 @@ int push_pathname(const char *dir, int l
+ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx)
{
- unsigned short flags;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
-@@ -341,7 +343,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;
-@@ -390,6 +392,12 @@ void send_file_entry(struct file_struct
- flags |= XMIT_SAME_TIME;
+@@ -432,6 +434,13 @@ static void send_file_entry(int f, struc
+ xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
-+ if (copy_atimes && !S_ISDIR(mode)) {
-+ if (file->atime == atime)
-+ flags |= XMIT_SAME_ATIME;
++ if (atimes_ndx && !S_ISDIR(mode)) {
++ time_t file_atime = F_ATIME(file);
++ if (file_atime == atime)
++ xflags |= XMIT_SAME_ATIME;
+ else
-+ atime = file->atime;
++ atime = file_atime;
+ }
- #if SUPPORT_HARD_LINKS
- if (file->link_u.idev) {
-@@ -445,6 +453,8 @@ void send_file_entry(struct file_struct
- write_int(f, modtime);
- if (!(flags & XMIT_SAME_MODE))
+ #ifdef SUPPORT_HARD_LINKS
+ if (tmp_dev != 0) {
+@@ -505,6 +514,8 @@ static void send_file_entry(int f, struc
+ }
+ if (!(xflags & 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);
-@@ -518,6 +528,7 @@ void receive_file_entry(struct file_stru
- struct file_list *flist, int f)
++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
++ write_varlong(f, atime, 4);
+ if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
+ if (protocol_version < 30)
+ write_int(f, uid);
+@@ -591,7 +602,7 @@ static void send_file_entry(int f, struc
+ static struct file_struct *recv_file_entry(struct file_list *flist,
+ int xflags, int f)
{
- static time_t modtime;
-+ static time_t atime;
+- static int64 modtime;
++ static int64 modtime, atime;
static mode_t mode;
- static uint64 dev;
+ static int64 dev;
static dev_t rdev;
-@@ -534,7 +545,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 15 Apr 2004 16:55:23 -0000 1.79
-+++ generator.c 20 Apr 2004 23:44:17 -0000
-@@ -97,7 +97,7 @@ static int skip_file(char *fname, struct
- return 0;
+@@ -722,6 +733,16 @@ static struct file_struct *recv_file_ent
}
+ if (!(xflags & XMIT_SAME_MODE))
+ mode = from_wire_mode(read_int(f));
++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
++ atime = read_varlong(f, 4);
++#if SIZEOF_TIME_T < SIZEOF_INT64
++ if ((atime > INT_MAX || atime < INT_MIN) && !am_generator) {
++ rprintf(FERROR,
++ "Access time value of %s truncated on receiver.\n",
++ lastname);
++ }
++#endif
++ }
-- return (cmp_modtime(st->st_mtime,file->modtime) == 0);
-+ return cmp_time(st->st_mtime,file->modtime) == 0;
- }
+ if (chmod_modes && !S_ISLNK(mode))
+ mode = tweak_mode(mode, chmod_modes);
+@@ -850,6 +871,8 @@ static struct file_struct *recv_file_ent
+ F_GROUP(file) = gid;
+ file->flags |= gid_flags;
+ }
++ if (atimes_ndx)
++ F_ATIME(file) = (time_t)atime;
+ #ifdef ICONV_OPTION
+ if (ic_ndx)
+ F_NDX(file) = flist->used + flist->ndx_start;
+@@ -1172,6 +1195,8 @@ struct file_struct *make_file(const char
+ F_OWNER(file) = st.st_uid;
+ if (gid_ndx)
+ F_GROUP(file) = st.st_gid;
++ if (atimes_ndx)
++ F_ATIME(file) = st.st_atime;
+
+ if (basename != thisname)
+ file->dirname = lastdir;
+--- old/generator.c
++++ new/generator.c
+@@ -43,6 +43,7 @@ extern int preserve_specials;
+ extern int preserve_hard_links;
+ extern int preserve_perms;
+ extern int preserve_times;
++extern int preserve_atimes;
+ extern int uid_ndx;
+ extern int gid_ndx;
+ extern int delete_mode;
+@@ -562,6 +563,9 @@ void itemize(const char *fnamecmp, struc
+ && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
+ || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
+ iflags |= ITEM_REPORT_TIME;
++ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode)
++ && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
++ iflags |= ITEM_REPORT_ATIME;
+ if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
+ iflags |= ITEM_REPORT_PERMS;
+ if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
+@@ -879,6 +883,8 @@ static int try_dests_reg(struct file_str
+ if (link_dest) {
+ if (!hard_link_one(file, fname, cmpbuf, 1))
+ goto try_a_copy;
++ if (preserve_atimes)
++ set_file_attrs(fname, file, sxp, NULL, 0);
+ if (preserve_hard_links && F_IS_HLINKED(file))
+ finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
+ if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+@@ -1075,6 +1081,7 @@ static int try_dests_non(struct file_str
+ static void list_file_entry(struct file_struct *f)
+ {
+ char permbuf[PERMSTRING_SIZE];
++ time_t atime = atimes_ndx ? F_ATIME(f) : 0;
+ double len;
+ if (!F_IS_ACTIVE(f)) {
+@@ -1089,14 +1096,16 @@ static void list_file_entry(struct file_
-@@ -464,7 +464,7 @@ void recv_generator(char *fname, struct
- return;
+ #ifdef SUPPORT_LINKS
+ if (preserve_links && S_ISLNK(f->mode)) {
+- rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
++ rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
+ permbuf, len, timestring(f->modtime),
++ atimes_ndx ? timestring(atime) : "",
+ f_name(f, NULL), F_SYMLINK(f));
+ } else
+ #endif
+ {
+- rprintf(FINFO, "%s %11.0f %s %s\n",
++ rprintf(FINFO, "%s %11.0f %s %s %s\n",
+ permbuf, len, timestring(f->modtime),
++ atimes_ndx ? timestring(atime) : "",
+ f_name(f, NULL));
}
-
-- 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 17 Apr 2004 17:07:23 -0000 1.147
-+++ options.c 20 Apr 2004 23:44:17 -0000
-@@ -46,6 +46,7 @@ int preserve_devices = 0;
+ }
+@@ -1846,7 +1855,7 @@ static void touch_up_dirs(struct file_li
+ if (!(file->mode & S_IWUSR))
+ do_chmod(fname, file->mode);
+ if (need_retouch_dir_times)
+- set_modtime(fname, file->modtime, file->mode);
++ set_times(fname, file->modtime, file->modtime, file->mode);
+ if (allowed_lull && !(counter % lull_mod))
+ maybe_send_keepalive();
+ else if (!(counter & 0xFF))
+--- old/log.c
++++ new/log.c
+@@ -631,7 +631,8 @@ static void log_formatted(enum logcode c
+ c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
+ c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
+ c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
+- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u';
++ c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.'
++ : S_ISLNK(file->mode) ? 'U' : 'u';
+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+ c[11] = '\0';
+--- old/options.c
++++ new/options.c
+@@ -57,6 +57,7 @@ int preserve_specials = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
-+int copy_atimes = 0;
++int preserve_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, ©_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
+@@ -346,6 +347,7 @@ void usage(enum logcode F)
+ rprintf(F," -D same as --devices --specials\n");
+ rprintf(F," -t, --times preserve modification times\n");
+ rprintf(F," -O, --omit-dir-times omit directories from --times\n");
++ rprintf(F," -U, --atimes preserve access (last-used) times\n");
+ rprintf(F," --super receiver attempts super-user activities\n");
+ #ifdef SUPPORT_XATTRS
+ rprintf(F," --fake-super store/recover privileged attrs using xattrs\n");
+@@ -480,6 +482,9 @@ static struct poptOption long_options[]
+ {"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 },
+ {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
++ {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
++ {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
++ {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
+ {"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
+ {"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
+@@ -1717,6 +1722,8 @@ void server_options(char **args, int *ar
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
-+ if (copy_atimes)
-+ argstr[x++] = 'A';
++ if (preserve_atimes)
++ argstr[x++] = 'U';
if (preserve_perms)
argstr[x++] = 'p';
- if (recurse)
---- proto.h 14 Apr 2004 23:33:30 -0000 1.188
-+++ proto.h 20 Apr 2004 23:44:17 -0000
-@@ -243,7 +243,7 @@ int fd_pair(int fd[2]);
- 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 u_strcmp(const char *cs1, const char
- 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);
---- rsync.c 23 Mar 2004 16:16:15 -0000 1.135
-+++ rsync.c 20 Apr 2004 23:44:17 -0000
-@@ -25,6 +25,7 @@
- extern int verbose;
- extern int dry_run;
+ else if (preserve_executability && am_sender)
+--- old/rsync.c
++++ new/rsync.c
+@@ -33,6 +33,7 @@ extern int preserve_acls;
+ extern int preserve_xattrs;
+ extern int preserve_perms;
+ extern int preserve_executability;
++extern int preserve_atimes;
extern int preserve_times;
-+extern int copy_atimes;
extern int am_root;
extern int am_server;
- extern int am_sender;
-@@ -140,17 +141,28 @@ int set_perms(char *fname,struct file_st
- st = &st2;
- }
+@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, st
+ int updated = 0;
+ statx sx2;
+ int change_uid, change_gid;
++ time_t atime, mtime;
+ mode_t new_mode = file->mode;
+ int inherit;
+
+@@ -383,18 +385,36 @@ int set_file_attrs(const char *fname, st
+ set_stat_xattr(fname, file);
+ #endif
-- 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, mtime;
-+
-+ if (copy_atimes && !S_ISDIR(st->st_mode)
-+ && cmp_time(st->st_atime, file->atime) != 0) {
-+ atime = file->atime;
-+ updated = 1;
-+ } else
-+ atime = st->st_atime;
-+ if (preserve_times && cmp_time(st->st_mtime, file->modtime) != 0) {
-+ mtime = file->modtime;
++ /* This code must be the first update in the function due to
++ * how it uses the "updated" variable. */
+ if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
+ flags |= ATTRS_SKIP_MTIME;
++ if (!preserve_atimes || S_ISDIR(sxp->st.st_mode))
++ flags |= ATTRS_SKIP_ATIME;
+ if (!(flags & ATTRS_SKIP_MTIME)
+ && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {
+- int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
++ mtime = file->modtime;
++ updated = 1;
++ } else
++ mtime = sxp->st.st_mtime;
++ if (!(flags & ATTRS_SKIP_ATIME)) {
++ time_t file_atime = F_ATIME(file);
++ if (cmp_time(sxp->st.st_atime, file_atime) != 0) {
++ atime = file_atime;
+ 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;
++ atime = sxp->st.st_atime;
++ } else
++ atime = sxp->st.st_atime;
++ if (updated) {
++ int ret = set_times(fname, mtime, atime, sxp->st.st_mode);
+ if (ret < 0) {
+ rsyserr(FERROR, errno, "failed to set times on %s",
+ full_fname(fname));
+ goto cleanup;
}
-- updated = 1;
+- if (ret == 0) /* ret == 1 if symlink could not be set */
+- updated = 1;
++ if (ret > 0) /* ret == 1 if symlink could not be set */
++ updated = 0;
}
- change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- rsync.h 17 Apr 2004 17:14:16 -0000 1.197
-+++ rsync.h 20 Apr 2004 23:44:18 -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)
+ change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
+--- old/rsync.h
++++ new/rsync.h
+@@ -57,6 +57,7 @@
+ #define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */
+ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
+ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */
++#define XMIT_SAME_ATIME (1<<13) /* protocols ?? - now */
/* These flags are used in the live flist data. */
-@@ -419,6 +420,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 17 Apr 2004 18:40:16 -0000 1.159
-+++ rsync.yo 20 Apr 2004 23:44:18 -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
+@@ -144,6 +145,7 @@
+
+ #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
+@@ -579,6 +581,7 @@ extern int file_extra_cnt;
+ extern int inc_recurse;
+ extern int uid_ndx;
+ extern int gid_ndx;
++extern int atimes_ndx;
+ extern int acls_ndx;
+ extern int xattrs_ndx;
+
+@@ -616,6 +619,7 @@ extern int xattrs_ndx;
+ /* When the associated option is on, all entries will have these present: */
+ #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum
+ #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum
++#define F_ATIME(f) REQ_EXTRA(f, atimes_ndx)->unum
+ #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num
+ #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num
+ #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
+--- old/rsync.yo
++++ new/rsync.yo
+@@ -354,6 +354,7 @@ to the detailed description below for a
+ -D same as --devices --specials
+ -t, --times preserve modification times
+ -O, --omit-dir-times omit directories from --times
++ -U, --atimes preserve access (use) times
+ --super receiver attempts super-user activities
+ --fake-super store/recover privileged attrs using xattrs
-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 @@ 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.
+@@ -956,6 +957,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(-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(-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 20 Apr 2004 23:44:18 -0000
-@@ -39,6 +39,7 @@
+ 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
+@@ -1633,8 +1640,10 @@ quote(itemization(
+ sender's value (requires bf(--owner) and super-user privileges).
+ it() A bf(g) means the group is different and is being updated to the
+ sender's value (requires bf(--group) and the authority to set the group).
+- it() The bf(u) slot is reserved for reporting update (access) time changes
+- (a feature that is not yet released).
++ it() A bf(u) means the access (use) time is different and is being updated to
++ the sender's value (requires bf(--atimes)). An alternate value of bf(U)
++ means that the access time will be set to the transfer time, which happens
++ when a symlink or directory is updated.
+ it() The bf(a) means that the ACL information changed.
+ it() The bf(x) slot is reserved for reporting extended attribute changes
+ (a feature that is not yet released).
+--- old/sender.c
++++ new/sender.c
+@@ -43,6 +43,7 @@ extern int do_progress;
+ extern int inplace;
+ extern int batch_fd;
+ extern int write_batch;
++extern unsigned int file_struct_len;
+ extern struct stats stats;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+
+--- old/testsuite/atimes.test
++++ new/testsuite/atimes.test
+@@ -0,0 +1,19 @@
++#! /bin/sh
++
++# Test rsync copying atimes
++
++. "$suitedir/rsync.fns"
++
++set -x
++
++mkdir "$fromdir"
++
++touch "$fromdir/foo"
++touch -a -t 200102031717.42 "$fromdir/foo"
++
++TLS_ARGS=--atime
++
++checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
++
++# The script would have aborted on error, so getting here means we've won.
++exit 0
+--- old/testsuite/rsync.fns
++++ new/testsuite/rsync.fns
+@@ -187,6 +187,10 @@ checkit() {
+ # We can just write everything to stdout/stderr, because the
+ # wrapper hides it unless there is a problem.
++ if test x$TLS_ARGS = x--atime; then
++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ fi
++
+ echo "Running: \"$1\""
+ eval "$1"
+ status=$?
+@@ -194,10 +198,13 @@ checkit() {
+ failed="YES";
+ fi
- #include "rsync.h"
-+#include "popt.h"
++ if test x$TLS_ARGS != x--atime; then
++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++ fi
++
+ echo "-------------"
+ echo "check how the directory listings compare with diff:"
+ echo ""
+- ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
+ ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
+ diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
- #define PROGRAM "tls"
+--- old/tls.c
++++ new/tls.c
+@@ -104,6 +104,8 @@ static int stat_xattr(const char *fname,
-@@ -48,6 +49,7 @@ int read_only = 1;
- int list_only = 0;
- int preserve_perms = 0;
+ #endif
+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 failed(char const *what, char const *where)
+ {
+ fprintf(stderr, PROGRAM ": %s %s: %s\n",
+@@ -111,12 +113,29 @@ static void failed(char const *what, cha
+ exit(1);
}
-+static void storetime(char *dest, time_t t)
++static void storetime(char *dest, time_t t, size_t destsize)
+{
+ if (t) {
+ struct tm *mt = gmtime(&t);
-
-+ sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ",
-+ 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)
++
++ snprintf(dest, destsize,
++ "%04d-%02d-%02d %02d:%02d:%02d ",
++ (int)mt->tm_year + 1900,
++ (int)mt->tm_mon + 1,
++ (int)mt->tm_mday,
++ (int)mt->tm_hour,
++ (int)mt->tm_min,
++ (int)mt->tm_sec);
++ } else
++ strlcpy(dest, " ", destsize);
++}
++
+ static void list_file(const char *fname)
{
STRUCT_STAT buf;
char permbuf[PERMSTRING_SIZE];
+ char atimebuf[50];
char linkbuf[4096];
- if (do_lstat(fname, &buf) == -1)
-@@ -97,19 +114,8 @@ static void list_file (const char *fname
+ if (do_lstat(fname, &buf) < 0)
+@@ -153,19 +172,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);
+- snprintf(datebuf, sizeof datebuf,
+- "%04d-%02d-%02d %02d:%02d:%02d",
+- (int)mt->tm_year + 1900,
+- (int)mt->tm_mon + 1,
+- (int)mt->tm_mday,
+- (int)mt->tm_hour,
+- (int)mt->tm_min,
+- (int)mt->tm_sec);
+- } else
+- strlcpy(datebuf, " ", sizeof datebuf);
++ storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
++ storetime(atimebuf, buf.st_atime, sizeof atimebuf);
/* TODO: Perhaps escape special characters in fname? */
-@@ -120,24 +126,55 @@ static void list_file (const char *fname
+@@ -176,13 +184,15 @@ 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%s\n",
(long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
- datebuf, fname, linkbuf);
-+ mtimebuf, display_atime ? atimebuf : "",
++ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? atimebuf : "",
+ fname, linkbuf);
}
-+static struct poptOption long_options[] = {
-+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
-+ {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
-+ {"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;
+ static struct poptOption long_options[] = {
+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
++ {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
+ #ifdef SUPPORT_XATTRS
+ {"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 },
+ #endif
+@@ -196,6 +206,7 @@ static void tls_usage(int ret)
+ fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
+ fprintf(F,"Trivial file listing program for portably checking rsync\n");
+ fprintf(F,"\nOptions:\n");
++ rprintf(F," -U, --atimes display access (last-used) times\n");
+ #ifdef SUPPORT_XATTRS
+ fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n");
+ #endif
+--- old/util.c
++++ new/util.c
+@@ -122,7 +122,7 @@ NORETURN void overflow_exit(const char *
+ exit_cleanup(RERR_MALLOC);
}
---- util.c 17 Apr 2004 17:06:03 -0000 1.136
-+++ util.c 20 Apr 2004 23:44:19 -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)
+-int set_modtime(const char *fname, time_t modtime, mode_t mode)
++int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
{
- extern int dry_run;
- if (dry_run)
- return 0;
+ #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
+ if (S_ISLNK(mode))
+@@ -130,9 +130,13 @@ int set_modtime(const char *fname, time_
+ #endif
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));
+
++ strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
+ rprintf(FINFO,
+ "set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
- fname, (long) modtime,
+ fname, (long)modtime,
- asctime(localtime(&modtime)));
-+ mtimebuf,
-+ (long) atime, atimebuf);
++ mtimebuf, (long)atime, timestring(atime));
}
+ if (dry_run)
+@@ -141,7 +145,7 @@ int set_modtime(const char *fname, time_
{
- #ifdef HAVE_UTIMBUF
+ #ifdef HAVE_UTIMES
+ 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;
+@@ -154,12 +158,12 @@ int set_modtime(const char *fname, time_
+ return utimes(fname, t);
+ #elif defined HAVE_UTIMBUF
struct utimbuf tbuf;
- tbuf.actime = time(NULL);
+ tbuf.actime = atime;
tbuf.modtime = modtime;
return utime(fname,&tbuf);
- #elif defined(HAVE_UTIME)
+ #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 @@ 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
-@@ -1062,7 +1070,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 20 Apr 2004 23:44:19 -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 20 Apr 2004 23:44:19 -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