X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/9c25eef5a53f1970a5379ac5320ff4172d08959a..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/atimes.diff diff --git a/atimes.diff b/atimes.diff index bb6fa4b..e8ef66c 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,91 +1,65 @@ To use this patch, run these commands for a successful build: patch -p1 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 +@@ -406,7 +407,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, #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)); - } - } -@@ -359,6 +363,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) + int ndx, int first_ndx) { - static time_t modtime; -+ static time_t atime; +- static time_t modtime; ++ static time_t modtime, atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; -@@ -458,6 +463,13 @@ static void send_file_entry(int f, struc - xflags |= XMIT_SAME_TIME; - else +@@ -506,6 +507,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, modtime = file->modtime; + if (NSEC_BUMP(file) && protocol_version >= 31) + xflags |= XMIT_MOD_NSEC; + if (atimes_ndx && !S_ISDIR(mode)) { -+ time_t file_atime = F_ATIME(file); ++ time_t file_atime = f_atime(file); + if (file_atime == atime) + xflags |= XMIT_SAME_ATIME; + else @@ -94,100 +68,163 @@ TODO: need to fix this to handle 64-bit time_t values! #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -530,6 +542,8 @@ static void send_file_entry(int f, struc - } +@@ -592,6 +600,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, + write_varint(f, F_MOD_NSEC(file)); if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); + if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) + write_varlong(f, atime, 4); - if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -616,7 +630,7 @@ static void send_file_entry(int f, struc - static struct file_struct *recv_file_entry(struct file_list *flist, - int xflags, int f) +@@ -677,7 +687,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, + + static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags) { - static int64 modtime; + static int64 modtime, atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; -@@ -753,6 +767,16 @@ static struct file_struct *recv_file_ent - } +@@ -821,6 +831,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x + modtime_nsec = 0; 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, ++ if (!am_generator && (int64)(time_t)atime != atime) { ++ rprintf(FERROR_XFER, + "Access time value of %s truncated on receiver.\n", + lastname); + } +#endif + } - if (chmod_modes && !S_ISLNK(mode)) + if (chmod_modes && !S_ISLNK(mode) && mode) mode = tweak_mode(mode, chmod_modes); -@@ -881,6 +905,8 @@ static struct file_struct *recv_file_ent +@@ -981,6 +1001,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x F_GROUP(file) = gid; file->flags |= gid_flags; } + if (atimes_ndx) -+ F_ATIME(file) = (time_t)atime; - #ifdef ICONV_OPTION - if (ic_ndx) ++ f_atime_set(file, (time_t)atime); + if (unsort_ndx) F_NDX(file) = flist->used + flist->ndx_start; -@@ -1196,6 +1222,8 @@ struct file_struct *make_file(const char + +@@ -1376,6 +1398,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, F_OWNER(file) = st.st_uid; - if (gid_ndx) + if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */ F_GROUP(file) = st.st_gid; + if (atimes_ndx) -+ F_ATIME(file) = st.st_atime; ++ f_atime_set(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; -@@ -563,6 +564,9 @@ void itemize(const char *fnamecmp, struc +diff --git a/generator.c b/generator.c +--- a/generator.c ++++ b/generator.c +@@ -454,6 +454,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre + : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED) && (!(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) ++ if (atimes_ndx && !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) -@@ -880,6 +884,8 @@ static int try_dests_reg(struct file_str + #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST + if (S_ISLNK(file->mode)) { + ; +@@ -824,6 +827,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (link_dest) { if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; -+ if (preserve_atimes) ++ if (atimes_ndx) + set_file_attrs(fname, file, sxp, NULL, 0); if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sxp->st, itemizing, code, j); - if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { -@@ -1782,7 +1788,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 + finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); + if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) { +@@ -1016,6 +1021,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, + static void list_file_entry(struct file_struct *f) + { + char permbuf[PERMSTRING_SIZE]; ++ time_t atime = atimes_ndx ? f_atime(f) : 0; + int64 len; + int colwidth = human_readable ? 14 : 11; + +@@ -1031,10 +1037,11 @@ static void list_file_entry(struct file_struct *f) + + #ifdef SUPPORT_LINKS + if (preserve_links && S_ISLNK(f->mode)) { +- rprintf(FINFO, "%s %*s %s %s -> %s\n", ++ rprintf(FINFO, "%s %*s %s %s %s -> %s\n", + permbuf, colwidth, comma_num(len), +- timestring(f->modtime), f_name(f, NULL), +- F_SYMLINK(f)); ++ timestring(f->modtime), ++ atimes_ndx ? timestring(atime) : "", ++ f_name(f, NULL), F_SYMLINK(f)); + } else + #endif + if (missing_args == 2 && f->mode == 0) { +@@ -1042,9 +1049,11 @@ static void list_file_entry(struct file_struct *f) + colwidth + 31, "*missing", + f_name(f, NULL)); + } else { +- rprintf(FINFO, "%s %*s %s %s\n", ++ rprintf(FINFO, "%s %*s %s %s %s\n", + permbuf, colwidth, comma_num(len), +- timestring(f->modtime), f_name(f, NULL)); ++ timestring(f->modtime), ++ atimes_ndx ? timestring(atime) : "", ++ f_name(f, NULL)); + } + } + +@@ -1924,7 +1933,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) + STRUCT_STAT st; + if (link_stat(fname, &st, 0) == 0 + && cmp_time(st.st_mtime, file->modtime) != 0) +- set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode); ++ set_times(fname, file->modtime, F_MOD_NSEC(file), file->modtime, file->mode); + } + if (counter >= loopchk_limit) { + if (allowed_lull) +diff --git a/ifuncs.h b/ifuncs.h +--- a/ifuncs.h ++++ b/ifuncs.h +@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb) + memset(xb, 0, sizeof (xbuf)); + } + ++static inline time_t ++f_atime(struct file_struct *fp) ++{ ++#if SIZEOF_TIME_T > 4 ++ time_t atime; ++ memcpy(&atime, &REQ_EXTRA(fp, atimes_ndx)->unum, SIZEOF_TIME_T); ++ return atime; ++#else ++ return REQ_EXTRA(fp, atimes_ndx)->unum; ++#endif ++} ++ ++static inline void ++f_atime_set(struct file_struct *fp, time_t atime) ++{ ++#if SIZEOF_TIME_T > 4 ++ memcpy(&REQ_EXTRA(fp, atimes_ndx)->unum, &atime, SIZEOF_TIME_T); ++#else ++ REQ_EXTRA(fp, atimes_ndx)->unum = (uint32)atime; ++#endif ++} ++ + static inline int + to_wire_mode(mode_t mode) + { +diff --git a/log.c b/log.c +--- a/log.c ++++ b/log.c +@@ -733,7 +733,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op, c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; @@ -197,9 +234,10 @@ TODO: need to fix this to handle 64-bit time_t values! c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a'; c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; c[11] = '\0'; ---- old/options.c -+++ new/options.c -@@ -56,6 +56,7 @@ int preserve_specials = 0; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -59,6 +59,7 @@ int preserve_specials = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; @@ -207,7 +245,7 @@ TODO: need to fix this to handle 64-bit time_t values! int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -344,6 +345,7 @@ void usage(enum logcode F) +@@ -699,6 +700,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"); @@ -215,7 +253,7 @@ TODO: need to fix this to handle 64-bit time_t values! rprintf(F," --super receiver attempts super-user activities\n"); #ifdef SUPPORT_XATTRS rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); -@@ -477,6 +479,9 @@ static struct poptOption long_options[] +@@ -846,6 +848,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 }, @@ -225,7 +263,7 @@ TODO: need to fix this to handle 64-bit time_t values! {"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 }, -@@ -1691,6 +1696,8 @@ void server_options(char **args,int *arg +@@ -2341,6 +2346,8 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -234,43 +272,36 @@ TODO: need to fix this to handle 64-bit time_t values! if (preserve_perms) argstr[x++] = 'p'; else if (preserve_executability && am_sender) ---- old/rsync.c -+++ new/rsync.c -@@ -32,6 +32,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 am_root; - extern int am_server; -@@ -273,6 +274,7 @@ int set_file_attrs(const char *fname, st +diff --git a/rsync.c b/rsync.c +--- a/rsync.c ++++ b/rsync.c +@@ -451,6 +451,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, int updated = 0; - statx sx2; + stat_x sx2; int change_uid, change_gid; + time_t atime, mtime; mode_t new_mode = file->mode; + int inherit; - if (!sxp) { -@@ -310,18 +312,36 @@ int set_file_attrs(const char *fname, st - set_stat_xattr(fname, file); +@@ -489,20 +490,38 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, + set_xattr(fname, file, fnamecmp, sxp); #endif + /* 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)) ++ if (!atimes_ndx || 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); +- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), 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); ++ time_t file_atime = f_atime(file); + if (cmp_time(sxp->st.st_atime, file_atime) != 0) { + atime = file_atime; + updated = 1; @@ -279,30 +310,52 @@ TODO: need to fix this to handle 64-bit time_t values! + } else + atime = sxp->st.st_atime; + if (updated) { -+ int ret = set_times(fname, mtime, atime, sxp->st.st_mode); ++ int ret = set_times(fname, mtime, F_MOD_NSEC(file), atime, sxp->st.st_mode); if (ret < 0) { - rsyserr(FERROR, errno, "failed to set times on %s", + rsyserr(FERROR_XFER, 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 */ +- else ++ if (ret > 0) { /* ret == 1 if symlink could not be set */ + updated = 0; + file->flags |= FLAG_TIME_FAILED; ++ } } 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 */ +@@ -639,7 +658,7 @@ int finish_transfer(const char *fname, const char *fnametmp, + + /* Change permissions before putting the file into place. */ + set_file_attrs(fnametmp, file, NULL, fnamecmp, +- ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); ++ ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME); + + /* move tmp file over real file */ + if (DEBUG_GTE(RECV, 1)) +@@ -666,7 +685,7 @@ int finish_transfer(const char *fname, const char *fnametmp, + + do_set_file_attrs: + set_file_attrs(fnametmp, file, NULL, fnamecmp, +- ok_to_set_time ? 0 : ATTRS_SKIP_MTIME); ++ ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME); + + if (temp_copy_name) { + if (do_rename(fnametmp, fname) < 0) { +diff --git a/rsync.h b/rsync.h +--- a/rsync.h ++++ b/rsync.h +@@ -62,6 +62,7 @@ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */ -+#define XMIT_SAME_ATIME (1<<13) /* protocols ?? - now */ + #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */ + #define XMIT_MOD_NSEC (1<<13) /* protocols 31 - now */ ++#define XMIT_SAME_ATIME (1<<14) /* protocols ?? - now */ /* These flags are used in the live flist data. */ -@@ -144,6 +145,7 @@ +@@ -160,6 +161,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -310,7 +363,7 @@ TODO: need to fix this to handle 64-bit time_t values! #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -573,6 +575,7 @@ extern int file_extra_cnt; +@@ -664,12 +666,14 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -318,17 +371,17 @@ TODO: need to fix this to handle 64-bit time_t values! extern int acls_ndx; extern int xattrs_ndx; -@@ -610,6 +613,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 + #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) + #define EXTRA_LEN (sizeof (union file_extras)) + #define PTR_EXTRA_CNT ((sizeof (char *) + EXTRA_LEN - 1) / EXTRA_LEN) ++#define TIME_EXTRA_CNT ((SIZEOF_TIME_T + EXTRA_LEN - 1) / EXTRA_LEN) + #define DEV_EXTRA_CNT 2 + #define DIRNODE_EXTRA_CNT 3 + #define SUM_EXTRA_CNT ((MAX_DIGEST_LEN + EXTRA_LEN - 1) / EXTRA_LEN) +diff --git a/rsync.yo b/rsync.yo +--- a/rsync.yo ++++ b/rsync.yo +@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb( -D same as --devices --specials -t, --times preserve modification times -O, --omit-dir-times omit directories from --times @@ -336,7 +389,7 @@ TODO: need to fix this to handle 64-bit time_t values! --super receiver attempts super-user activities --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently -@@ -947,6 +948,12 @@ it is preserving modification times (see +@@ -1078,6 +1079,12 @@ it is preserving modification times (see bf(--times)). If NFS is sharing 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). @@ -349,69 +402,59 @@ TODO: need to fix this to handle 64-bit time_t values! 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 -@@ -1609,8 +1616,10 @@ quote(itemization( +@@ -1945,7 +1952,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() The bf(u) slot is reserved for future use. + 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 @@ + it() The bf(x) means that the extended attribute information changed. + )) +diff --git a/testsuite/atimes.test b/testsuite/atimes.test +new file mode 100644 +--- /dev/null ++++ b/testsuite/atimes.test +@@ -0,0 +1,17 @@ +#! /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 ++TLS_ARGS=--atimes + +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() { +diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns +--- a/testsuite/rsync.fns ++++ b/testsuite/rsync.fns +@@ -218,6 +218,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 ++ if test x$TLS_ARGS = x--atimes; then + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" + fi + echo "Running: \"$1\"" eval "$1" status=$? -@@ -194,10 +198,13 @@ checkit() { +@@ -225,10 +229,13 @@ checkit() { failed="YES"; fi -+ if test x$TLS_ARGS != x--atime; then ++ if test x$TLS_ARGS != x--atimes; then + ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" + fi + @@ -422,36 +465,45 @@ TODO: need to fix this to handle 64-bit time_t values! ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES ---- old/tls.c -+++ new/tls.c -@@ -99,6 +99,8 @@ static int stat_xattr(const char *fname, +diff --git a/tls.c b/tls.c +--- a/tls.c ++++ b/tls.c +@@ -118,6 +118,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) #endif -+static int display_atime = 0; -+ ++static int display_atimes = 0; ++ static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", -@@ -106,12 +108,29 @@ static void failed(char const *what, cha +@@ -125,12 +127,37 @@ static void failed(char const *what, char const *where) exit(1); } -+static void storetime(char *dest, time_t t, size_t destsize) ++static void storetime(char *dest, size_t destsize, time_t t, int nsecs) +{ + if (t) { ++ int len; + struct tm *mt = gmtime(&t); + -+ snprintf(dest, destsize, -+ "%04d-%02d-%02d %02d:%02d:%02d ", ++ len = 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); ++ if (nsecs >= 0) { ++ snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs); ++ } ++ } else { ++ int has_nsecs = nsecs >= 0 ? 1 : 0; ++ int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1); ++ memset(datebuf, ' ', len); ++ datebuf[len] = '\0'; ++ } +} + static void list_file(const char *fname) @@ -465,14 +517,16 @@ TODO: need to fix this to handle 64-bit time_t values! char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -148,19 +167,8 @@ static void list_file(const char *fname) +@@ -168,30 +195,17 @@ static void list_file(const char *fname) + } permstring(permbuf, buf.st_mode); - +- - if (buf.st_mtime) { +- int len; - mt = gmtime(&buf.st_mtime); - -- snprintf(datebuf, sizeof datebuf, +- len = snprintf(datebuf, sizeof datebuf, - "%04d-%02d-%02d %02d:%02d:%02d", - (int)mt->tm_year + 1900, - (int)mt->tm_mon + 1, @@ -480,54 +534,70 @@ TODO: need to fix this to handle 64-bit time_t values! - (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); + #ifdef ST_MTIME_NSEC +- if (nsec_times) { +- snprintf(datebuf + len, sizeof datebuf - len, +- ".%09d", (int)buf.ST_MTIME_NSEC); +- } ++ if (nsec_times) ++ nsecs = (int)buf.ST_MTIME_NSEC ++ else + #endif +- } else { +- int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1); +- memset(datebuf, ' ', len); +- datebuf[len] = '\0'; +- } ++ nsecs = -1; ++ storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs); ++ if (display_atimes) ++ storetime(atimebuf, sizeof atimebuf, S_ISDIR(buf.st_mode) ? 0 : buf.st_atime, -1); ++ else ++ atimebuf[0] = '\0'; /* TODO: Perhaps escape special characters in fname? */ -@@ -171,13 +179,15 @@ static void list_file(const char *fname) +@@ -202,13 +216,14 @@ 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); + } else + printf("%15s", do_big_num(buf.st_size, 1, NULL)); - 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 && !S_ISDIR(buf.st_mode) ? atimebuf : "", -+ fname, linkbuf); ++ mtimebuf, 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}, ++ {"atimes", 'U', POPT_ARG_NONE, &display_atimes, 0, 0, 0}, + {"link-times", 'l', POPT_ARG_NONE, &link_times, 0, 0, 0 }, + {"link-owner", 'L', POPT_ARG_NONE, &link_owner, 0, 0, 0 }, #ifdef SUPPORT_XATTRS - {"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 }, - #endif -@@ -191,6 +201,7 @@ static void tls_usage(int ret) +@@ -227,6 +242,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"); ++ fprintf(F," -U, --atimes display access (last-used) times\n"); + fprintf(F," -l, --link-times display the time on a symlink\n"); + fprintf(F," -L, --link-owner display the owner+group on a symlink\n"); #ifdef SUPPORT_XATTRS - fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n"); - #endif ---- old/util.c -+++ new/util.c -@@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char * +diff --git a/util.c b/util.c +--- a/util.c ++++ b/util.c +@@ -123,7 +123,7 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } --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) +-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) ++int set_times(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, mode_t mode) { - #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES + #ifndef CAN_SET_SYMLINK_TIMES if (S_ISLNK(mode)) -@@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_ +@@ -131,9 +131,13 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) #endif - if (verbose > 2) { + if (DEBUG_GTE(TIME, 1)) { - rprintf(FINFO, "set modtime of %s to (%ld) %s", + char mtimebuf[200]; + @@ -540,18 +610,29 @@ TODO: need to fix this to handle 64-bit time_t values! } if (dry_run) -@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_ +@@ -142,8 +146,8 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) { - #ifdef HAVE_UTIMES + #ifdef HAVE_UTIMENSAT + struct timespec t[2]; +- t[0].tv_sec = 0; +- t[0].tv_nsec = UTIME_NOW; ++ t[0].tv_sec = atime; ++ t[0].tv_nsec = 0; + t[1].tv_sec = modtime; + t[1].tv_nsec = mod_nsec; + if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) < 0) +@@ -151,7 +155,7 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) + return 0; + #elif defined HAVE_UTIMES || defined HAVE_LUTIMES 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; -@@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_ - return utimes(fname, t); - #elif defined HAVE_UTIMBUF + t[1].tv_usec = mod_nsec / 1000; +@@ -164,12 +168,12 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) + # endif + #elif defined HAVE_STRUCT_UTIMBUF struct utimbuf tbuf; - tbuf.actime = time(NULL); + tbuf.actime = atime;