./configure (optional if already run)
make
+TODO: need to fix this to handle 64-bit time_t values!
---- old/flist.c
-+++ new/flist.c
-@@ -46,6 +46,7 @@ extern int preserve_devices;
- extern int preserve_specials;
+--- old/compat.c
++++ new/compat.c
+@@ -44,6 +44,7 @@ extern int protocol_version;
+ extern int protect_args;
extern int preserve_uid;
extern int preserve_gid;
+extern int preserve_atimes;
+ extern int preserve_acls;
+ extern int preserve_xattrs;
+ extern int need_messages_from_generator;
+@@ -63,7 +64,7 @@ extern iconv_t ic_send, ic_recv;
+ #endif
+
+ /* These index values are for the file-list's extra-attribute array. */
+-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx;
++int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx;
+ #ifdef ICONV_OPTION
+ int ic_ndx;
+
+@@ -115,6 +116,8 @@ void setup_protocol(int f_out,int f_in)
+ uid_ndx = ++file_extra_cnt;
+ if (preserve_gid)
+ gid_ndx = ++file_extra_cnt;
++ if (preserve_atimes)
++ atimes_ndx = ++file_extra_cnt;
+ if (preserve_acls && !am_sender)
+ acls_ndx = ++file_extra_cnt;
+ if (preserve_xattrs)
+--- old/flist.c
++++ new/flist.c
+@@ -53,6 +53,7 @@ extern int preserve_specials;
+ extern int uid_ndx;
+ extern int gid_ndx;
+ extern int eol_nulls;
++extern int atimes_ndx;
extern int relative_paths;
extern int implied_dirs;
- extern int flist_extra_cnt;
-@@ -134,6 +135,7 @@ void show_flist_stats(void)
+ extern int file_extra_cnt;
+@@ -174,6 +175,7 @@ void show_flist_stats(void)
static void list_file_entry(struct file_struct *f)
{
char permbuf[PERMSTRING_SIZE];
-+ time_t atime = preserve_atimes ? F_ATIME(f) : 0;
++ time_t atime = atimes_ndx ? F_ATIME(f) : 0;
double len;
if (!F_IS_ACTIVE(f)) {
-@@ -146,14 +148,16 @@ static void list_file_entry(struct file_
+@@ -188,14 +190,16 @@ static void list_file_entry(struct file_
#ifdef SUPPORT_LINKS
if (preserve_links && S_ISLNK(f->mode)) {
- rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
+ rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
permbuf, len, timestring(f->modtime),
-+ preserve_atimes ? timestring(atime) : "",
++ 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),
-+ preserve_atimes ? timestring(atime) : "",
++ atimes_ndx ? timestring(atime) : "",
f_name(f, NULL));
}
}
-@@ -311,6 +315,7 @@ static void send_file_entry(struct file_
+@@ -363,6 +367,7 @@ int push_pathname(const char *dir, int l
+ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx)
{
- unsigned short flags;
static time_t modtime;
+ static time_t atime;
static mode_t mode;
static int64 dev;
static dev_t rdev;
-@@ -326,7 +331,7 @@ static void send_file_entry(struct file_
-
- 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;
-@@ -376,6 +381,13 @@ static void send_file_entry(struct file_
- flags |= XMIT_SAME_TIME;
+@@ -461,6 +466,13 @@ static void send_file_entry(int f, struc
+ xflags |= XMIT_SAME_TIME;
else
modtime = file->modtime;
-+ if (preserve_atimes && !S_ISDIR(mode)) {
++ 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_idev.dev != 0) {
-@@ -428,6 +440,8 @@ static void send_file_entry(struct file_
- write_int(f, modtime);
- if (!(flags & XMIT_SAME_MODE))
+ if (tmp_dev != 0) {
+@@ -534,6 +546,8 @@ static void send_file_entry(int f, struc
+ }
+ 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);
-@@ -494,7 +508,7 @@ static void send_file_entry(struct file_
++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
++ write_varlong(f, atime, 4);
+ if (uid_ndx && !(xflags & XMIT_SAME_UID)) {
+ if (protocol_version < 30)
+ write_int(f, uid);
+@@ -620,7 +634,7 @@ static void send_file_entry(int f, struc
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;
static int64 dev;
static dev_t rdev;
-@@ -514,7 +528,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;
-@@ -570,6 +584,8 @@ static struct file_struct *recv_file_ent
- modtime = (time_t)read_int(f);
- if (!(flags & XMIT_SAME_MODE))
+@@ -751,6 +765,16 @@ static struct file_struct *recv_file_ent
+ }
+ 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 ((atime > INT_MAX || atime < INT_MIN) && !am_generator) {
++ rprintf(FERROR,
++ "Access time value of %s truncated on receiver.\n",
++ lastname);
++ }
++#endif
++ }
if (chmod_modes && !S_ISLNK(mode))
mode = tweak_mode(mode, chmod_modes);
-@@ -654,6 +670,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;
-
- if (dirname_len) {
- file->dirname = lastdir = bp;
-@@ -931,6 +949,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)
+@@ -879,6 +903,8 @@ static struct file_struct *recv_file_ent
+ F_GROUP(file) = gid;
+ file->flags |= gid_flags;
+ }
++ if (atimes_ndx)
++ F_ATIME(file) = (time_t)atime;
+ #ifdef ICONV_OPTION
+ if (ic_ndx)
+ F_NDX(file) = flist->used + flist->ndx_start;
+@@ -1196,6 +1222,8 @@ struct file_struct *make_file(const char
+ F_OWNER(file) = st.st_uid;
+ if (gid_ndx)
+ F_GROUP(file) = st.st_gid;
++ if (atimes_ndx)
+ F_ATIME(file) = st.st_atime;
- if (dirname_len) {
- file->dirname = lastdir = bp;
+ if (basename != thisname)
+ file->dirname = lastdir;
--- old/generator.c
+++ new/generator.c
-@@ -43,6 +43,7 @@ extern int preserve_perms;
- extern int preserve_uid;
- extern int preserve_gid;
+@@ -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 omit_dir_times;
+ extern int uid_ndx;
+ extern int gid_ndx;
extern int delete_mode;
- extern int delete_before;
-@@ -547,6 +548,9 @@ void itemize(struct file_struct *file, i
+@@ -562,6 +563,9 @@ void itemize(const char *fnamecmp, struc
&& (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
- || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0))
+ || (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), st->st_atime) != 0)
++ && cmp_time(F_ATIME(file), sxp->st.st_atime) != 0)
+ iflags |= ITEM_REPORT_ATIME;
- if ((unsigned)(st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS))
+ if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
iflags |= ITEM_REPORT_PERMS;
- if (preserve_uid && am_root && F_UID(file) != st->st_uid)
-@@ -859,6 +863,8 @@ static int try_dests_reg(struct file_str
- if (hard_link_one(file, ndx, fname, 0, stp,
- cmpbuf, 1, i, code) < 0)
+ if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
+@@ -879,6 +883,8 @@ static int try_dests_reg(struct file_str
+ if (link_dest) {
+ if (!hard_link_one(file, fname, cmpbuf, 1))
goto try_a_copy;
+ if (preserve_atimes)
-+ set_file_attrs(fname, file, stp, 0);
++ set_file_attrs(fname, file, sxp, NULL, 0);
if (preserve_hard_links && F_IS_HLINKED(file))
- hard_link_cluster(file, ndx, itemizing, code, j);
- } else
+ finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
+ if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
+@@ -1793,7 +1799,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
-@@ -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
+@@ -630,7 +630,8 @@ static void log_formatted(enum logcode c
c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';
-- c[8] = '.';
+- 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)) {
+ c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a';
+ c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x';
+ c[11] = '\0';
--- old/options.c
+++ new/options.c
-@@ -55,6 +55,7 @@ int preserve_uid = 0;
+@@ -56,6 +56,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;
-@@ -307,8 +308,9 @@ void usage(enum logcode F)
- rprintf(F," --devices preserve device files (super-user only)\n");
- rprintf(F," --specials preserve special files\n");
+@@ -345,6 +346,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");
-@@ -425,6 +427,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");
+@@ -480,6 +482,9 @@ static struct poptOption long_options[]
+ {"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 },
+ {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
- {"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 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 },
-@@ -1223,6 +1228,8 @@ int parse_arguments(int *argc, const cha
- preserve_uid = ++flist_extra_cnt;
- if (preserve_gid)
- preserve_gid = ++flist_extra_cnt;
-+ if (preserve_atimes)
-+ preserve_atimes = ++flist_extra_cnt;
-
- *argv = poptGetArgs(pc);
- *argc = count_args(*argv);
-@@ -1542,6 +1549,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 },
+@@ -1715,6 +1720,8 @@ void server_options(char **args, int *ar
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
else if (preserve_executability && am_sender)
--- old/rsync.c
+++ new/rsync.c
-@@ -34,6 +34,7 @@ extern int verbose;
- extern int dry_run;
+@@ -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 omit_dir_times;
extern int am_root;
-@@ -182,6 +183,7 @@ int set_file_attrs(char *fname, struct f
+ extern int am_server;
+@@ -342,6 +343,7 @@ int set_file_attrs(const char *fname, st
int updated = 0;
- STRUCT_STAT st2;
+ statx 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
- }
- }
+@@ -382,18 +384,36 @@ int set_file_attrs(const char *fname, st
+ set_stat_xattr(fname, file);
+ #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 (!preserve_atimes || 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) {
++ 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",
full_fname(fname));
- return 0;
+ goto cleanup;
}
- if (ret == 0) /* ret == 1 if symlink could not be set */
- updated = 1;
+ updated = 0;
}
- change_uid = am_root && preserve_uid && st->st_uid != F_UID(file);
+ change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
--- old/rsync.h
+++ new/rsync.h
-@@ -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)
+@@ -57,6 +57,7 @@
+ #define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */
+ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */
+ #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */
++#define XMIT_SAME_ATIME (1<<13) /* protocols ?? - now */
/* These flags are used in the live flist data. */
-@@ -121,6 +122,7 @@
+@@ -144,6 +145,7 @@
#define ATTRS_REPORT (1<<0)
#define ATTRS_SKIP_MTIME (1<<1)
#define FULL_FLUSH 1
#define NORMAL_FLUSH 0
-@@ -511,6 +513,7 @@ struct file_struct {
- union flist_extras {
- uid_t uid; /* The user ID number */
- uid_t gid; /* The group ID number or GID_NONE */
-+ time_t utime; /* A unix-time value */
- struct idev *idev; /* The hard-link info during matching */
- struct hlist *hlist; /* The hard-link info after matching */
- int32 num; /* A signed number */
-@@ -553,6 +556,7 @@ extern int preserve_gid;
+@@ -573,6 +575,7 @@ extern int file_extra_cnt;
+ extern int inc_recurse;
+ extern int uid_ndx;
+ extern int gid_ndx;
++extern int atimes_ndx;
+ extern int acls_ndx;
+ extern int xattrs_ndx;
+
+@@ -610,6 +613,7 @@ extern int xattrs_ndx;
/* When the associated option is on, all entries will have these present: */
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
-+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->utime
-
- /* These items are per-entry optional and mutally exclusive: */
- #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
+ #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
-@@ -328,8 +328,9 @@ to the detailed description below for a
- --devices preserve device files (super-user only)
- --specials preserve special files
+@@ -354,6 +354,7 @@ to the detailed description below for a
-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
+@@ -948,6 +949,12 @@ it is preserving modification times (see
the directories on the receiving side, it is a good idea to use bf(-O).
This option is inferred if you use bf(--backup) without bf(--backup-dir).
dit(bf(--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(
+@@ -1610,8 +1617,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 reporting update (access) time changes
+- (a feature that is not yet released).
+ it() A bf(u) means the access (use) time is different and is being updated to
+ the sender's value (requires bf(--atimes)). An alternate value of bf(U)
+ means that the access time will be set to the transfer time, which happens
+ when a symlink or directory is updated.
- ))
-
- One other output is possible: when deleting files, the "%i" will output
+ 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
-@@ -41,6 +41,7 @@ extern int do_progress;
+@@ -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 *the_file_list;
- extern char *stdout_format;
+ extern struct file_list *cur_flist, *first_flist, *dir_flist;
+
--- old/testsuite/atimes.test
+++ new/testsuite/atimes.test
@@ -0,0 +1,19 @@
+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() {
+@@ -187,6 +187,10 @@ checkit() {
# We can just write everything to stdout/stderr, because the
# wrapper hides it unless there is a problem.
echo "Running: \"$1\""
eval "$1"
status=$?
-@@ -191,10 +195,13 @@ checkit() {
+@@ -194,10 +198,13 @@ checkit() {
failed="YES";
fi
--- old/tls.c
+++ new/tls.c
-@@ -34,6 +34,7 @@
- * change. */
-
- #include "rsync.h"
-+#include "popt.h"
-
- #define PROGRAM "tls"
+@@ -99,6 +99,8 @@ static int stat_xattr(const char *fname,
-@@ -43,6 +44,8 @@ int read_only = 1;
- int list_only = 0;
- int preserve_perms = 0;
+ #endif
+static int display_atime = 0;
+
static void failed(char const *what, char const *where)
{
fprintf(stderr, PROGRAM ": %s %s: %s\n",
-@@ -50,12 +53,29 @@ static void failed(char const *what, cha
+@@ -106,12 +108,29 @@ static void failed(char const *what, cha
exit(1);
}
char linkbuf[4096];
if (do_lstat(fname, &buf) < 0)
-@@ -88,19 +108,8 @@ static void list_file(const char *fname)
+@@ -148,19 +167,8 @@ static void list_file(const char *fname)
permstring(permbuf, buf.st_mode);
/* TODO: Perhaps escape special characters in fname? */
-@@ -111,23 +120,55 @@ static void list_file(const char *fname)
+@@ -171,13 +179,15 @@ static void list_file(const char *fname)
(long)minor(buf.st_rdev));
} else /* NB: use double for size since it might not fit in a long. */
printf("%12.0f", (double)buf.st_size);
- 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);
}
- 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;
- }
+ static struct poptOption long_options[] = {
+ /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
++ {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0},
+ #ifdef SUPPORT_XATTRS
+ {"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 },
+ #endif
+@@ -191,6 +201,7 @@ static void tls_usage(int ret)
+ fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n");
+ fprintf(F,"Trivial file listing program for portably checking rsync\n");
+ fprintf(F,"\nOptions:\n");
++ rprintf(F," -U, --atimes display access (last-used) times\n");
+ #ifdef SUPPORT_XATTRS
+ fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n");
+ #endif
--- old/util.c
+++ new/util.c
@@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char *
Matt McCutchen's Web Site / rsync / rsync-patches.git / blobdiff