X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/1f874579d057c6579c61d69eb218e148e943fb9d..refs/heads/master:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 3bd28ed..e8ef66c 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,330 +1,463 @@ -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-05-28 08:24:57 -+++ 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_ +based-on: a01e3b490eb36ccf9e704840e1b6683dab867550 +diff --git a/compat.c b/compat.c +--- a/compat.c ++++ b/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; +@@ -61,7 +62,7 @@ extern char *iconv_opt; + #endif - #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 + /* These index values are for the file-list's extra-attribute array. */ +-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx; ++int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx; + + int receiver_symlink_times = 0; /* receiver can set the time on a symlink */ + int sender_symlink_iconv = 0; /* sender should convert symlink content */ +@@ -138,6 +139,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 += TIME_EXTRA_CNT); + if (preserve_acls && !am_sender) + acls_ndx = ++file_extra_cnt; + if (preserve_xattrs) +diff --git a/flist.c b/flist.c +--- a/flist.c ++++ b/flist.c +@@ -55,6 +55,7 @@ extern int missing_args; + 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; +@@ -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", - 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 + int ndx, int first_ndx) { - unsigned short flags; - 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; -@@ -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; - else +@@ -506,6 +507,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, modtime = file->modtime; -+ if (copy_atimes && !S_ISDIR(mode)) { -+ if (file->atime == atime) -+ flags |= XMIT_SAME_ATIME; + if (NSEC_BUMP(file) && protocol_version >= 31) + xflags |= XMIT_MOD_NSEC; ++ 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) { +@@ -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 (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 (preserve_uid && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) + write_int(f, uid); +@@ -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 time_t modtime; -+ static time_t atime; +- static int64 modtime; ++ static int64 modtime, atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS 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)) +@@ -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 (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; -@@ -882,6 +898,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-05-22 20:53:34 -+++ generator.c 2004-11-03 23:02:12 -@@ -375,7 +375,7 @@ static int unchanged_file(char *fn, stru - if (ignore_times) - return 0; ++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) { ++ atime = read_varlong(f, 4); ++#if SIZEOF_TIME_T < SIZEOF_INT64 ++ if (!am_generator && (int64)(time_t)atime != atime) { ++ rprintf(FERROR_XFER, ++ "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) + mode = tweak_mode(mode, chmod_modes); +@@ -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_set(file, (time_t)atime); + if (unsort_ndx) + F_NDX(file) = flist->used + flist->ndx_start; + +@@ -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) /* Check gid_ndx instead of preserve_gid for del support */ + F_GROUP(file) = st.st_gid; ++ if (atimes_ndx) ++ f_atime_set(file, st.st_atime); + + if (basename != thisname) + file->dirname = lastdir; +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)) + iflags |= ITEM_REPORT_TIME; ++ 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 !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 (atimes_ndx) ++ 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 (!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) -@@ -849,7 +849,7 @@ static void recv_generator(char *fname, + #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)); } + } - 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-05-19 08:52:42 -+++ options.c 2005-02-21 10:53:28 -@@ -49,6 +49,7 @@ int preserve_uid = 0; +@@ -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'; +- 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'; +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; - 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; -@@ -286,6 +287,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"); -@@ -413,6 +415,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 }, -@@ -1290,6 +1293,8 @@ void server_options(char **args,int *arg +@@ -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"); ++ 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"); +@@ -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 }, ++ {"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 }, +@@ -2341,6 +2346,8 @@ void server_options(char **args, int *argc_p) 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; - 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 + argstr[x++] = 'p'; + else if (preserve_executability && am_sender) +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; - 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; - } +@@ -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 -+ 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 (!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, F_MOD_NSEC(file), 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, F_MOD_NSEC(file), atime, sxp->st.st_mode); + if (ret < 0) { + 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; +- else ++ if (ret > 0) { /* ret == 1 if symlink could not be set */ ++ updated = 0; + file->flags |= FLAG_TIME_FAILED; ++ } } - change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- orig/rsync.h 2005-05-03 17:11:01 -+++ 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); +@@ -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_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. */ -@@ -118,6 +119,7 @@ +@@ -160,6 +161,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 -@@ -509,6 +511,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-05-22 20:53:34 -+++ rsync.yo 2005-01-24 01:57:18 -@@ -322,6 +322,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 +@@ -664,12 +666,14 @@ 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; + + #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 ++ -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) -@@ -659,6 +660,11 @@ 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). -+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 -@@ -0,0 +1,19 @@ + 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 +@@ -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 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) 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 -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() { +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. -+ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" ++ if test x$TLS_ARGS = x--atimes; then ++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" ++ fi + echo "Running: \"$1\"" eval "$1" status=$? -@@ -168,7 +170,6 @@ checkit() { +@@ -225,10 +229,13 @@ checkit() { + failed="YES"; + fi + ++ if test x$TLS_ARGS != x--atimes; then ++ ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from" ++ fi ++ echo "-------------" echo "check how the directory listings compare with diff:" echo "" @@ -332,45 +465,47 @@ 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 @@ +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 - #include "rsync.h" -+#include "popt.h" - - #define PROGRAM "tls" - -@@ -48,6 +49,7 @@ int read_only = 1; - int list_only = 0; - int preserve_perms = 0; - -+static int display_atime = 0; - ++static int display_atimes = 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", +@@ -125,12 +127,37 @@ static void failed(char const *what, char const *where) exit(1); } -+static void storetime(char *dest, time_t t) ++static void storetime(char *dest, size_t destsize, time_t t, int nsecs) +{ + if (t) { ++ int len; + 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); ++ ++ 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); ++ if (nsecs >= 0) { ++ snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs); ++ } + } else { -+ strcpy(dest, " "); ++ 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) { STRUCT_STAT buf; @@ -382,119 +517,122 @@ command before "make": char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -96,19 +113,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); - -- 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); +- len = 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); + #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 { -- strcpy(datebuf, " "); +- int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1); +- memset(datebuf, ' ', len); +- datebuf[len] = '\0'; - } -+ storetime(mtimebuf, buf.st_mtime); -+ storetime(atimebuf, buf.st_atime); ++ 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? */ -@@ -119,24 +125,55 @@ 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}, -+ {"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 */ ++ {"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 +@@ -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"); ++ 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 +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); } ---- orig/util.c 2005-05-03 16:47:33 -+++ 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, 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 (verbose > 2) { + #ifndef CAN_SET_SYMLINK_TIMES + if (S_ISLNK(mode)) +@@ -131,9 +131,13 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) + #endif + + if (DEBUG_GTE(TIME, 1)) { - rprintf(FINFO, "set modtime of %s to (%ld) %s", + char mtimebuf[200]; + + 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 +@@ -142,8 +146,8 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) { - #ifdef HAVE_UTIMBUF + #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 = 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; @@ -507,29 +645,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; -@@ -1156,8 +1161,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 -@@ -1166,7 +1171,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)