X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fdf967c7385fcb3ca1141d12fa2c8ea1f7953132..0ef5abcbbb95298fa9faf1d3eb275a9e76e1d951:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 377fc0f..8eea52f 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,217 +1,266 @@ 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), -+ preserve_atimes ? timestring(atime) : "", - f_name(f, NULL), F_SYMLINK(f)); - } else + int receiver_symlink_times = 0; /* receiver can set the time on a symlink */ + int sender_symlink_iconv = 0; /* sender should convert symlink content */ +@@ -137,6 +138,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 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; +@@ -393,7 +394,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), -+ preserve_atimes ? timestring(atime) : "", - f_name(f, NULL)); - } - } -@@ -314,6 +318,7 @@ static void send_file_entry(struct file_ + 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; -@@ -367,6 +372,13 @@ static void send_file_entry(struct file_ - flags |= XMIT_SAME_TIME; +@@ -467,6 +468,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, + xflags |= XMIT_SAME_TIME; else modtime = file->modtime; -+ if (preserve_atimes && !S_ISDIR(mode)) { -+ time_t file_atime = F_ATIME(file); ++ if (atimes_ndx && !S_ISDIR(mode)) { ++ time_t file_atime = f_atime(file); + if (file_atime == atime) -+ flags |= XMIT_SAME_ATIME; ++ xflags |= XMIT_SAME_ATIME; + else + atime = file_atime; + } #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -434,6 +446,8 @@ static void send_file_entry(struct file_ - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) +@@ -538,6 +546,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 (preserve_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); -@@ -501,7 +515,7 @@ static void send_file_entry(struct file_ ++ 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); +@@ -622,7 +632,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, static struct file_struct *recv_file_entry(struct file_list *flist, - unsigned short flags, int f) + int xflags, int f) { -- static time_t modtime; -+ static time_t modtime, atime; +- static int64 modtime; ++ static int64 modtime, atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; -@@ -522,7 +536,7 @@ static struct file_struct *recv_file_ent - 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; -@@ -610,6 +624,8 @@ static struct file_struct *recv_file_ent - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) +@@ -756,6 +766,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, + } + if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); -+ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) -+ atime = (time_t)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 (!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)) mode = tweak_mode(mode, chmod_modes); -@@ -700,6 +716,8 @@ static struct file_struct *recv_file_ent - F_UID(file) = uid; - if (preserve_gid) - F_GID(file) = gid; -+ if (preserve_atimes) -+ F_ATIME(file) = atime; +@@ -905,6 +925,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, + 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; + +@@ -1277,6 +1299,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 +@@ -21,6 +21,7 @@ + */ - if (dirname_len) { - file->dirname = lastdir = bp; -@@ -1002,6 +1020,8 @@ struct file_struct *make_file(const char - F_UID(file) = st.st_uid; - if (preserve_gid) - F_GID(file) = st.st_gid; -+ if (preserve_atimes) -+ F_ATIME(file) = st.st_atime; + #include "rsync.h" ++#include "ifuncs.h" - if (dirname_len) { - file->dirname = lastdir = bp; ---- old/generator.c -+++ new/generator.c -@@ -43,6 +43,7 @@ extern int preserve_perms; - extern int preserve_uid; - extern int preserve_gid; - extern int preserve_times; -+extern int preserve_atimes; - extern int omit_dir_times; - extern int delete_mode; - extern int delete_before; -@@ -547,6 +548,9 @@ void itemize(struct file_struct *file, i + extern int verbose; + extern int dry_run; +@@ -648,6 +649,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, st->st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; -+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode) -+ && cmp_time(F_ATIME(file), 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(st->st_mode, file->mode, CHMOD_BITS)) - iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && F_UID(file) != st->st_uid) -@@ -858,6 +862,8 @@ static int try_dests_reg(struct file_str + #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST + if (S_ISLNK(file->mode)) { + ; +@@ -1018,6 +1022,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) -+ set_file_attrs(fname, file, stp, 0); ++ if (atimes_ndx) ++ set_file_attrs(fname, file, sxp, NULL, 0); if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, stp, itemizing, code, j); - if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { ---- old/log.c -+++ new/log.c -@@ -37,6 +37,7 @@ extern int msg_fd_out; - extern int allow_8bit_chars; - extern int protocol_version; - extern int preserve_times; -+extern int preserve_atimes; - extern int preserve_uid; - extern int preserve_gid; - extern int stdout_format_has_i; -@@ -625,7 +626,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)) { +@@ -1203,6 +1209,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)) { +@@ -1217,14 +1224,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)); + } + } +@@ -2059,7 +2068,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 +@@ -660,7 +660,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] = '.'; +- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u'; + c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' + : S_ISLNK(file->mode) ? 'U' : 'u'; - c[9] = '\0'; - - if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { ---- old/options.c -+++ new/options.c -@@ -55,6 +55,7 @@ int preserve_uid = 0; + 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 preserve_atimes = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -306,8 +307,9 @@ void usage(enum logcode F) - rprintf(F," --devices preserve device files (super-user only)\n"); - rprintf(F," --specials preserve special files\n"); +@@ -354,6 +355,7 @@ void usage(enum logcode F) rprintf(F," -D same as --devices --specials\n"); -- rprintf(F," -t, --times preserve times\n"); -- rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); -+ rprintf(F," -t, --times preserve modify times\n"); -+ rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n"); -+ rprintf(F," -U, --atimes preserve access (use) times\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"); - rprintf(F," -S, --sparse handle sparse files efficiently\n"); - rprintf(F," -n, --dry-run show what would have been transferred\n"); -@@ -424,6 +426,9 @@ static struct poptOption long_options[] - {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, + #ifdef SUPPORT_XATTRS + rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); +@@ -491,6 +493,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, 2, 0, 0 }, - {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, - {"super", 0, POPT_ARG_VAL, &am_root, 2, 0, 0 }, -@@ -1536,6 +1541,8 @@ void server_options(char **args,int *arg + {"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 }, +@@ -1774,6 +1779,8 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -220,75 +269,90 @@ To use this patch, run these commands for a successful build: if (preserve_perms) argstr[x++] = 'p'; else if (preserve_executability && am_sender) ---- old/rsync.c -+++ new/rsync.c -@@ -34,6 +34,7 @@ extern int verbose; - extern int dry_run; - extern int preserve_perms; - extern int preserve_executability; -+extern int preserve_atimes; - extern int preserve_times; - extern int omit_dir_times; - extern int am_root; -@@ -182,6 +183,7 @@ int set_file_attrs(char *fname, struct f +diff --git a/rsync.c b/rsync.c +--- a/rsync.c ++++ b/rsync.c +@@ -383,6 +383,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) { -@@ -201,18 +203,36 @@ int set_file_attrs(char *fname, struct f - } - } +@@ -426,20 +427,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(st->st_mode) && omit_dir_times)) + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1)) flags |= ATTRS_SKIP_MTIME; -+ if (!preserve_atimes || S_ISDIR(st->st_mode)) ++ if (!atimes_ndx || S_ISDIR(sxp->st.st_mode)) + flags |= ATTRS_SKIP_ATIME; if (!(flags & ATTRS_SKIP_MTIME) - && cmp_time(st->st_mtime, file->modtime) != 0) { -- int ret = set_modtime(fname, file->modtime, st->st_mode); + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { +- int ret = set_modtime(fname, file->modtime, sxp->st.st_mode); + mtime = file->modtime; + updated = 1; + } else -+ mtime = st->st_mtime; ++ mtime = sxp->st.st_mtime; + if (!(flags & ATTRS_SKIP_ATIME)) { -+ time_t file_atime = F_ATIME(file); -+ if (cmp_time(st->st_atime, file_atime) != 0) { ++ time_t file_atime = f_atime(file); ++ if (cmp_time(sxp->st.st_atime, file_atime) != 0) { + atime = file_atime; + updated = 1; + } else -+ atime = st->st_atime; ++ atime = sxp->st.st_atime; + } else -+ atime = st->st_atime; ++ atime = sxp->st.st_atime; + if (updated) { -+ int ret = set_times(fname, mtime, atime, st->st_mode); ++ 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)); - return 0; + 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 && preserve_uid && st->st_uid != F_UID(file); ---- old/rsync.h -+++ new/rsync.h -@@ -55,6 +55,7 @@ - #define XMIT_SAME_DEV_pre30 (1<<10) /* protocols < 30 */ - #define XMIT_HLINK_FIRST (1<<10) /* protocols >= 30 */ - #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); +@@ -573,7 +592,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) +@@ -600,7 +619,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 +@@ -60,6 +60,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. */ -@@ -128,6 +129,7 @@ +@@ -154,6 +155,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -296,37 +360,33 @@ To use this patch, run these commands for a successful build: #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -522,6 +524,7 @@ struct file_struct { - extern int flist_extra_cnt; - extern int preserve_uid; - extern int preserve_gid; -+extern int preserve_atimes; +@@ -632,12 +634,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)) -@@ -554,6 +557,7 @@ extern int preserve_gid; - /* When the associated option is on, all entries will have these present: */ - #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum - #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum -+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum - - /* These items are per-entry optional and mutally exclusive: */ - #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num ---- old/rsync.yo -+++ new/rsync.yo -@@ -328,8 +328,9 @@ to the detailed description below for a - --devices preserve device files (super-user only) - --specials preserve special files + #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 +@@ -353,6 +353,7 @@ to the detailed description below for a complete description. verb( -D same as --devices --specials -- -t, --times preserve times -- -O, --omit-dir-times omit directories when preserving times -+ -t, --times preserve modify times -+ -O, --omit-dir-times omit directories when preserving mod-times + -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 -@@ -870,6 +871,12 @@ it is preserving modification times (see +@@ -1004,6 +1005,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). @@ -339,95 +399,59 @@ To use this patch, run these commands for a successful build: 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 -@@ -1403,7 +1410,7 @@ with older versions of rsync, but that a - verbose messages). - - The "%i" escape has a cryptic output that is 9 letters long. The general --format is like the string bf(YXcstpogz), where bf(Y) is replaced by the -+format is like the string bf(YXcstpogu), where bf(Y) is replaced by the - type of update being done, bf(X) is replaced by the file-type, and the - other letters represent attributes that may be output if they are being - modified. -@@ -1443,7 +1450,7 @@ quote(itemization( - by the file transfer. - it() A bf(t) means the modification time is different and is being updated - to the sender's value (requires bf(--times)). An alternate value of bf(T) -- means that the time will be set to the transfer time, which happens -+ means that the modify time will be set to the transfer time, which happens - anytime a symlink is transferred, or when a file or device is transferred - without bf(--times). - it() A bf(p) means the permissions are different and are being updated to -@@ -1452,7 +1459,10 @@ quote(itemization( +@@ -1723,7 +1730,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(z) slot is reserved for future use. +- 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. )) - - One other output is possible: when deleting files, the "%i" will output ---- old/sender.c -+++ new/sender.c -@@ -41,6 +41,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 *the_file_list; - extern char *stdout_format; ---- old/testsuite/atimes.test -+++ new/testsuite/atimes.test -@@ -0,0 +1,19 @@ +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 -@@ -66,7 +66,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 - } - - check_perms() { -@@ -184,6 +184,10 @@ checkit() { +diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns +--- a/testsuite/rsync.fns ++++ b/testsuite/rsync.fns +@@ -215,6 +215,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=$? -@@ -191,10 +195,13 @@ checkit() { +@@ -222,10 +226,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 + @@ -438,26 +462,19 @@ To use this patch, run these commands for a successful build: ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES ---- old/tls.c -+++ new/tls.c -@@ -34,6 +34,7 @@ - * change. */ - - #include "rsync.h" -+#include "popt.h" +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) - #define PROGRAM "tls" - -@@ -43,6 +44,8 @@ int read_only = 1; - int list_only = 0; - int preserve_perms = 0; + #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", -@@ -50,12 +53,29 @@ static void failed(char const *what, cha +@@ -114,12 +116,29 @@ static void failed(char const *what, char const *where) exit(1); } @@ -489,7 +506,7 @@ To use this patch, run these commands for a successful build: char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -88,19 +108,8 @@ static void list_file(const char *fname) +@@ -158,19 +177,11 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -507,11 +524,14 @@ To use this patch, run these commands for a successful build: - } 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? */ -@@ -111,23 +120,55 @@ 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); @@ -519,66 +539,27 @@ To use this patch, run these commands for a successful build: + 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); -+} -+ -+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); ++ mtimebuf, atimebuf, fname, linkbuf); } - 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; - -- for (argv++; *argv; argv++) { -- list_file(*argv); -+ 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); -+ } - } - -+ extra_args = poptGetArgs(pc); -+ if (*extra_args == NULL) -+ tls_usage(1); -+ -+ for (; *extra_args; extra_args++) -+ list_file(*extra_args); -+ poptFreeContext(pc); -+ - return 0; - } ---- old/util.c -+++ new/util.c -@@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char * + 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 +@@ -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"); ++ 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); } @@ -587,7 +568,7 @@ To use this patch, run these commands for a successful build: { #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES 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, mode_t mode) #endif if (verbose > 2) { @@ -603,7 +584,7 @@ To use this patch, run these commands for a successful build: } if (dry_run) -@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_ +@@ -142,7 +146,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) { #ifdef HAVE_UTIMES struct timeval t[2]; @@ -612,9 +593,9 @@ To use this patch, run these commands for a successful build: 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_ +@@ -156,12 +160,12 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) return utimes(fname, t); - #elif defined HAVE_UTIMBUF + #elif defined HAVE_STRUCT_UTIMBUF struct utimbuf tbuf; - tbuf.actime = time(NULL); + tbuf.actime = atime;