X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=atimes.diff;h=403b558a0f9b7ff8c81a9724c91cac02ec5a684e;hb=refs%2Fheads%2Fb3.0.x;hp=be2f024f3a918348ab203b62de6a40641b4e4a2d;hpb=790ba11acdb77fcd3d81ba5749081f79ded86d04;p=rsync.git%2Fpatches.git diff --git a/atimes.diff b/atimes.diff index be2f024..403b558 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 + extern int ignore_perishable; +@@ -392,7 +393,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)); - } - } -@@ -361,6 +365,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; -@@ -460,6 +465,13 @@ static void send_file_entry(int f, struc +@@ -476,6 +477,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, xflags |= XMIT_SAME_TIME; else modtime = file->modtime; + 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 @@ -93,34 +67,34 @@ TODO: need to fix this to handle 64-bit time_t values! + } #ifdef SUPPORT_HARD_LINKS - if (tmp_dev != 0) { -@@ -532,6 +544,8 @@ static void send_file_entry(int f, struc + if (tmp_dev != -1) { +@@ -547,6 +555,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *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); -@@ -618,7 +632,7 @@ static void send_file_entry(int f, struc - static struct file_struct *recv_file_entry(struct file_list *flist, - int xflags, int f) +@@ -632,7 +642,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; -@@ -755,6 +769,16 @@ static struct file_struct *recv_file_ent +@@ -765,6 +775,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x } 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); + } @@ -129,65 +103,126 @@ TODO: need to fix this to handle 64-bit time_t values! if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -883,6 +907,8 @@ static struct file_struct *recv_file_ent +@@ -915,6 +935,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; -@@ -1198,6 +1224,8 @@ struct file_struct *make_file(const char - F_OWNER(file) = st.st_uid; - if (gid_ndx) + +@@ -1289,6 +1311,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, F_GROUP(file) = st.st_gid; + if (am_generator && st.st_uid == our_uid) + file->flags |= FLAG_OWNED_BY_US; + 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 +@@ -21,6 +21,7 @@ + */ + + #include "rsync.h" ++#include "ifuncs.h" + + extern int verbose; + extern int dry_run; +@@ -682,6 +683,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)) { + ; +@@ -1058,6 +1062,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 && (verbose > 1 || stdout_format_has_i > 1)) { +@@ -1243,6 +1249,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; + double len; + + if (!F_IS_ACTIVE(f)) { +@@ -1257,14 +1264,16 @@ static void list_file_entry(struct file_struct *f) + + #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)); + } + } +@@ -2121,7 +2130,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, file->mode); ++ set_times(fname, file->modtime, 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 +@@ -67,6 +67,28 @@ d_name(struct dirent *di) + #endif + } + ++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 + isDigit(const char *ptr) + { +diff --git a/log.c b/log.c +--- a/log.c ++++ b/log.c +@@ -658,7 +658,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 +232,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 +243,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; -@@ -345,6 +346,7 @@ void usage(enum logcode F) +@@ -352,6 +353,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,8 +251,8 @@ 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"); -@@ -479,6 +481,9 @@ static struct poptOption long_options[] - {"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 }, +@@ -489,6 +491,9 @@ static struct poptOption long_options[] = { + {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 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 }, @@ -225,7 +261,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 }, -@@ -1707,6 +1712,8 @@ void server_options(char **args, int *ar +@@ -1784,6 +1789,8 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -234,33 +270,28 @@ 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 +@@ -380,6 +380,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); +@@ -423,22 +424,40 @@ 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)) + if (!preserve_times + || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode)) + || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode))) 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) { @@ -270,7 +301,7 @@ TODO: need to fix this to handle 64-bit time_t values! + } 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; @@ -281,28 +312,50 @@ TODO: need to fix this to handle 64-bit time_t values! + 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", + 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 */ +@@ -578,7 +597,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 (verbose > 2) +@@ -605,7 +624,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 +@@ -61,6 +61,7 @@ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */ + #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */ +#define XMIT_SAME_ATIME (1<<13) /* 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; +@@ -652,12 +654,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 +@@ -366,6 +366,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 -@@ -948,6 +949,12 @@ it is preserving modification times (see +@@ -1077,6 +1078,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,141 @@ 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 -@@ -1610,8 +1617,10 @@ quote(itemization( +@@ -1838,7 +1845,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/syscall.c b/syscall.c +--- a/syscall.c ++++ b/syscall.c +@@ -302,15 +302,15 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence) + } + + #ifdef HAVE_UTIMENSAT +-int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec) ++int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec) + { + struct timespec t[2]; + + if (dry_run) return 0; + RETURN_ERROR_IF_RO_OR_LO; + +- t[0].tv_sec = 0; +- t[0].tv_nsec = UTIME_NOW; ++ t[0].tv_sec = atime; ++ t[0].tv_nsec = a_nsec; + t[1].tv_sec = modtime; + t[1].tv_nsec = mod_nsec; + return utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW); +@@ -318,15 +318,15 @@ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec) + #endif + + #ifdef HAVE_LUTIMES +-int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec) ++int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec) + { + struct timeval t[2]; + + if (dry_run) return 0; + RETURN_ERROR_IF_RO_OR_LO; + +- t[0].tv_sec = time(NULL); +- t[0].tv_usec = 0; ++ t[0].tv_sec = atime; ++ t[0].tv_usec = a_nsec; + t[1].tv_sec = modtime; + t[1].tv_usec = mod_nsec / 1000; + return lutimes(fname, t); +@@ -334,22 +334,22 @@ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec) + #endif + + #ifdef HAVE_UTIMES +-int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec) ++int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec) + { + struct timeval t[2]; + + if (dry_run) return 0; + RETURN_ERROR_IF_RO_OR_LO; + +- t[0].tv_sec = time(NULL); +- t[0].tv_usec = 0; ++ t[0].tv_sec = atime; ++ t[0].tv_usec = a_nsec; + t[1].tv_sec = modtime; + t[1].tv_usec = mod_nsec / 1000; + return utimes(fname, t); + } + + #elif defined HAVE_UTIME +-int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec)) ++int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec), time_t atime, UNUSED(uint32 a_nsec)) + { + #ifdef HAVE_STRUCT_UTIMBUF + struct utimbuf tbuf; +@@ -361,11 +361,11 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec)) + RETURN_ERROR_IF_RO_OR_LO; + + # ifdef HAVE_STRUCT_UTIMBUF +- tbuf.actime = time(NULL); ++ tbuf.actime = atime; + tbuf.modtime = modtime; + return utime(fname, &tbuf); + # else +- t[0] = time(NULL); ++ t[0] = atime; + t[1] = modtime; + return utime(fname, t); + # endif +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 +@@ -220,6 +220,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() { - failed="YES"; +@@ -227,10 +231,13 @@ checkit() { + failed="$failed status=$status" 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 + @@ -420,20 +545,21 @@ TODO: need to fix this to handle 64-bit time_t values! 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 + diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed="$failed dir-diff" ---- 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 +@@ -107,6 +107,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 +@@ -114,12 +116,29 @@ static void failed(char const *what, char const *where) exit(1); } @@ -465,7 +591,7 @@ 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) +@@ -158,19 +177,11 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -483,11 +609,14 @@ TODO: need to fix this to handle 64-bit time_t values! - } else - strlcpy(datebuf, " ", sizeof datebuf); + storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf); -+ storetime(atimebuf, buf.st_atime, sizeof atimebuf); ++ if (display_atimes) ++ storetime(atimebuf, S_ISDIR(buf.st_mode) ? 0 : buf.st_atime, sizeof atimebuf); ++ else ++ atimebuf[0] = '\0'; /* TODO: Perhaps escape special characters in fname? */ -@@ -171,13 +179,15 @@ static void list_file(const char *fname) +@@ -181,13 +192,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); @@ -495,37 +624,34 @@ TODO: need to fix this to handle 64-bit time_t values! + 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) +@@ -203,6 +215,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 * - exit_cleanup(RERR_MALLOC); - } +diff --git a/util.c b/util.c +--- a/util.c ++++ b/util.c +@@ -125,20 +125,24 @@ NORETURN void overflow_exit(const char *str) + /* This returns 0 for success, 1 for a symlink if symlink time-setting + * is not possible, or -1 for any other error. */ -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)) -@@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_ - #endif + static int switch_step = 0; if (verbose > 2) { - rprintf(FINFO, "set modtime of %s to (%ld) %s", @@ -539,28 +665,33 @@ TODO: need to fix this to handle 64-bit time_t values! + mtimebuf, (long)atime, timestring(atime)); } - if (dry_run) -@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_ - { + switch (switch_step) { + #ifdef HAVE_UTIMENSAT + #include "case_N.h" +- if (do_utimensat(fname, modtime, 0) == 0) ++ if (do_utimensat(fname, modtime, 0, atime, 0) == 0) + break; + if (errno != ENOSYS) + return -1; +@@ -148,7 +152,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) + + #ifdef HAVE_LUTIMES + #include "case_N.h" +- if (do_lutimes(fname, modtime, 0) == 0) ++ if (do_lutimes(fname, modtime, 0, atime, 0) == 0) + break; + if (errno != ENOSYS) + return -1; +@@ -167,10 +171,10 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) + + #include "case_N.h" #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; -@@ -153,12 +157,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 - time_t t[2]; -- t[0] = time(NULL); -+ t[0] = atime; - t[1] = modtime; - return utime(fname,t); +- if (do_utimes(fname, modtime, 0) == 0) ++ if (do_utimes(fname, modtime, 0, atime, 0) == 0) + break; #else +- if (do_utime(fname, modtime, 0) == 0) ++ if (do_utime(fname, modtime, 0, atime, 0) == 0) + break; + #endif +