X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/18ae7b8789354cbf9ebac5a94796e7c17dd8df83..f264662f71d65a8addc50d3ee0372d82c903bf2a:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 4d9863e..f9ef446 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,289 +1,379 @@ -After applying this patch and running configure, you MUST run this -command before "make": +To use this patch, run these commands for a successful build: - make proto + patch -p1 flags=%#x\n", fptr[i]->flags); - rprintf(FINFO, "flist->modtime=%#lx\n", - (long unsigned) fptr[i]->modtime); -+ rprintf(FINFO, "flist->atime=%#lx\n", -+ (long unsigned) fptr[i]->atime); - rprintf(FINFO, "flist->length=%.0f\n", - (double) fptr[i]->length); - rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode); ---- orig/flist.c 2005-03-30 17:31:41 -+++ flist.c 2005-02-07 21:06:04 -@@ -54,6 +54,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; - extern int orig_umask; -@@ -141,16 +142,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, - (double)f->length, timestring(f->modtime), -+ timestring(f->atime), - safe_fname(f_name(f)), safe_fname(f->u.link)); - } else +--- 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), -+ timestring(f->atime), - safe_fname(f_name(f))); - } - } -@@ -314,6 +317,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 int64 dev; static dev_t rdev; -@@ -329,7 +333,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; -@@ -378,6 +382,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; + } #ifdef SUPPORT_HARD_LINKS - if (file->link_u.idev) { -@@ -433,6 +443,8 @@ void send_file_entry(struct file_struct - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) + 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); -@@ -506,6 +518,7 @@ static struct file_struct *receive_file_ - unsigned short flags, 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 int64 dev; static dev_t rdev; -@@ -524,7 +537,7 @@ static struct file_struct *receive_file_ - struct file_struct *file; - - if (!flist) { -- modtime = 0, mode = 0; -+ modtime = 0, atime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); - rdev_major = 0; - uid = 0, gid = 0; -@@ -580,6 +593,8 @@ static struct file_struct *receive_file_ - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) +@@ -722,6 +733,16 @@ static struct file_struct *recv_file_ent + } + if (!(xflags & 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); -@@ -630,6 +645,7 @@ static struct file_struct *receive_file_ - - file->flags = 0; - file->modtime = modtime; -+ file->atime = atime; - file->length = file_length; - file->mode = mode; - file->uid = uid; -@@ -879,6 +895,7 @@ skip_filters: - - 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; ---- orig/generator.c 2005-03-30 16:35:08 -+++ generator.c 2004-11-03 23:02:12 -@@ -372,7 +372,7 @@ static int unchanged_file(char *fn, stru - if (ignore_times) - return 0; - -- return cmp_modtime(st->st_mtime, file->modtime) == 0; -+ return cmp_time(st->st_mtime, file->modtime) == 0; - } - ++ 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 ++ } -@@ -837,7 +837,7 @@ static void recv_generator(char *fname, + 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_ - if (update_only && statret == 0 -- && cmp_modtime(st.st_mtime, file->modtime) > 0) { -+ && cmp_time(st.st_mtime, file->modtime) > 0) { - if (verbose > 1) - rprintf(FINFO, "%s is newer\n", safe_fname(fname)); - return; ---- orig/options.c 2005-03-31 00:24:21 -+++ options.c 2005-02-21 10:53:28 -@@ -50,6 +50,7 @@ int preserve_uid = 0; + #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)); + } + } +@@ -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 omit_dir_times = 0; -+int copy_atimes = 0; ++int preserve_atimes = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -285,6 +286,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," -O, --omit-dir-times omit directories when preserving times\n"); - rprintf(F," -S, --sparse handle sparse files efficiently\n"); - rprintf(F," -n, --dry-run show what would have been transferred\n"); -@@ -410,6 +412,7 @@ static struct poptOption long_options[] - {"devices", 'D', POPT_ARG_NONE, &preserve_devices, 0, 0, 0 }, - {"times", 't', POPT_ARG_NONE, &preserve_times, 0, 0, 0 }, - {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 2, 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 }, -@@ -1272,6 +1275,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 (omit_dir_times == 2 && am_sender) - argstr[x++] = 'O'; ++ if (preserve_atimes) ++ argstr[x++] = 'U'; if (preserve_perms) ---- orig/rsync.c 2005-03-16 02:19:30 -+++ rsync.c 2005-02-21 10:57:03 -@@ -27,6 +27,7 @@ extern int dry_run; - extern int daemon_log_format_has_i; + argstr[x++] = 'p'; + else if (preserve_executability && am_sender) +--- old/rsync.c ++++ new/rsync.c +@@ -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 omit_dir_times; -+extern int copy_atimes; extern int am_root; extern int am_server; - extern int am_sender; -@@ -56,6 +57,7 @@ int set_perms(char *fname,struct file_st +@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, st int updated = 0; - STRUCT_STAT st2; + stat_x sx2; int change_uid, change_gid; + time_t atime, mtime; + mode_t new_mode = file->mode; + int inherit; - if (!st) { - if (dry_run) -@@ -68,17 +70,27 @@ int set_perms(char *fname,struct file_st - st = &st2; - } +@@ -383,18 +385,36 @@ int set_file_attrs(const char *fname, st + set_stat_xattr(fname, file); + #endif -+ if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode)) -+ flags |= PERMS_SKIP_ATIME; - if (!preserve_times || S_ISLNK(st->st_mode) - || (S_ISDIR(st->st_mode) && omit_dir_times)) - flags |= PERMS_SKIP_MTIME; -+ if (!(flags & PERMS_SKIP_ATIME) -+ && cmp_time(st->st_atime, file->atime) != 0) { -+ atime = file->atime; ++ /* 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 -+ atime = st->st_atime; - if (!(flags & PERMS_SKIP_MTIME) -- && cmp_modtime(st->st_mtime, file->modtime) != 0) { -- if (set_modtime(fname,file->modtime) != 0) { -- rsyserr(FERROR, errno, "failed to set times on %s", -- full_fname(fname)); -- return 0; -- } -+ && cmp_time(st->st_mtime, file->modtime) != 0) { -+ mtime = file->modtime; - updated = 1; ++ 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 ++ atime = sxp->st.st_atime; + } else -+ mtime = st->st_mtime; -+ if (updated && set_times(fname, mtime, atime) != 0) { -+ rsyserr(FERROR, errno, "failed to set times on %s", -+ full_fname(fname)); -+ return 0; ++ 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; + } +- 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; ---- orig/rsync.h 2005-03-28 20:56:55 -+++ rsync.h 2004-07-03 20:15:41 -@@ -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. */ -@@ -118,6 +119,7 @@ +@@ -144,6 +145,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 -@@ -510,6 +512,7 @@ struct file_struct { - struct hlink *links; - } link_u; - time_t modtime; -+ time_t atime; - uid_t uid; - gid_t gid; - mode_t mode; ---- orig/rsync.yo 2005-03-30 16:57:29 -+++ rsync.yo 2005-01-24 01:57:18 -@@ -321,6 +321,7 @@ to the detailed description below for a - -D, --devices preserve devices (root only) - -t, --times preserve times - -O, --omit-dir-times omit directories when preserving times -+ -A, --copy-atimes copy access times +@@ -582,6 +584,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; + +@@ -619,6 +622,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 +@@ -350,6 +350,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 files whole (without rsync algorithm) -@@ -655,6 +656,11 @@ it is preserving modification times (see +@@ -960,6 +961,12 @@ it is preserving modification times (see the directories on the receiving side, it is a good idea to use bf(-O). This option is inferred if you use bf(--backup) without bf(--backup-dir). -+dit(bf(-A, --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(-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(-n, --dry-run)) This tells rsync to not do any file transfers, - instead it will just report the actions it would have taken. - ---- orig/testsuite/copy-atimes.test 2004-06-30 00:06:23 -+++ testsuite/copy-atimes.test 2004-06-30 00:06:23 + 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 +@@ -1641,8 +1648,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 + @@ -300,31 +390,31 @@ command before "make": + +TLS_ARGS=--atime + -+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" ++checkit "$RSYNC -rtUgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" + +# The script would have aborted on error, so getting here means we've won. +exit 0 ---- orig/testsuite/rsync.fns 2005-02-21 07:26:59 -+++ testsuite/rsync.fns 2005-02-21 07:30:11 -@@ -50,7 +50,7 @@ printmsg() { - - - rsync_ls_lR() { -- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" -+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS - } - - rsync_getgroups() { -@@ -158,6 +158,8 @@ checkit() { +--- 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. -+ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" ++ if test x$TLS_ARGS = x--atime; then ++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" ++ fi + echo "Running: \"$1\"" eval "$1" status=$? -@@ -168,7 +170,6 @@ checkit() { +@@ -194,10 +198,13 @@ checkit() { + failed="YES"; + fi + ++ 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 "" @@ -332,45 +422,38 @@ command before "make": ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES ---- orig/tls.c 2005-01-19 19:30:29 -+++ tls.c 2005-03-23 17:49:48 -@@ -39,6 +39,7 @@ - - - #include "rsync.h" -+#include "popt.h" - - #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) { -@@ -56,14 +58,29 @@ static void failed(char const *what, cha + 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, " "); -+ } -+} - ++ ++ 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; @@ -382,29 +465,29 @@ command before "make": char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -96,19 +113,8 @@ static void list_file(const char *fname) +@@ -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? */ -@@ -119,24 +125,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); @@ -412,72 +495,38 @@ command before "make": + 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 && !S_ISDIR(buf.st_mode) ? 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); } ---- orig/util.c 2005-03-30 20:45:02 -+++ util.c 2005-02-07 21:09:12 -@@ -128,12 +128,17 @@ 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) { + #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]; @@ -485,16 +534,24 @@ command before "make": + strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf); + rprintf(FINFO, + "set modtime, atime of %s to (%ld) %s, (%ld) %s\n", - safe_fname(fname), (long)modtime, + fname, (long)modtime, - asctime(localtime(&modtime))); -+ mtimebuf, -+ (long)atime, timestring(atime)); ++ mtimebuf, (long)atime, timestring(atime)); } if (dry_run) -@@ -142,17 +147,17 @@ int set_modtime(char *fname, time_t modt +@@ -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; @@ -507,29 +564,3 @@ command before "make": 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; -@@ -1146,8 +1151,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 -@@ -1156,7 +1161,7 @@ int msleep(int t) - * - * @retval -1 if the 2nd is later - **/ --int cmp_modtime(time_t file1, time_t file2) -+int cmp_time(time_t file1, time_t file2) - { - if (file2 > file1) { - if (file2 - file1 <= modify_window)