The patches for 3.0.0pre9.

[rsync/rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 3edded1..a27692b 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -1,109 +1,99 @@
 To use this patch, run these commands for a successful build:
 
     patch -p1 <patches/atimes.diff
 To use this patch, run these commands for a successful build:
 
     patch -p1 <patches/atimes.diff

-    ./prepare-source

     ./configure                      (optional if already run)
     make
 
     ./configure                      (optional if already run)
     make
 

-TODO:  need to fix this to handle 64-bit time_t values!
-
---- old/compat.c
-+++ new/compat.c
-@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in)
-               preserve_uid = ++file_extra_cnt;
+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;
+@@ -60,7 +61,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, unsort_ndx;
++int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
+ 
+ #ifdef ICONV_OPTION
+ int filesfrom_convert = 0;
+@@ -124,6 +125,8 @@ void setup_protocol(int f_out,int f_in)
+               uid_ndx = ++file_extra_cnt;

        if (preserve_gid)
        if (preserve_gid)

-               preserve_gid = ++file_extra_cnt;
+               gid_ndx = ++file_extra_cnt;

 +      if (preserve_atimes)
 +      if (preserve_atimes)

-+              preserve_atimes = ++file_extra_cnt;
++              atimes_ndx = (file_extra_cnt += TIME_EXTRA_CNT);

        if (preserve_acls && !am_sender)
        if (preserve_acls && !am_sender)

-               preserve_acls = ++file_extra_cnt;
+               acls_ndx = ++file_extra_cnt;

        if (preserve_xattrs)
        if (preserve_xattrs)

---- old/flist.c
-+++ new/flist.c
-@@ -51,6 +51,7 @@ extern int preserve_devices;
- extern int preserve_specials;
- extern int preserve_uid;
- extern int preserve_gid;
-+extern int preserve_atimes;
+diff --git a/flist.c b/flist.c
+--- a/flist.c
++++ b/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 file_extra_cnt;
  extern int relative_paths;
  extern int implied_dirs;
  extern int file_extra_cnt;

-@@ -154,6 +155,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;
-       double len;
- 
-       if (!F_IS_ACTIVE(f)) {
-@@ -168,14 +170,16 @@ static void list_file_entry(struct file_
+@@ -342,7 +343,7 @@ int push_pathname(const char *dir, int len)

  
  

- #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) : "",
-                       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) : "",
-                       f_name(f, NULL));
-       }
- }
-@@ -344,6 +348,7 @@ int push_pathname(const char *dir, int l
- static void send_file_entry(int f, struct file_struct *file, int ndx)
+ static void send_file_entry(int f, struct file_struct *file, 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;
        static mode_t mode;

+ #ifdef SUPPORT_HARD_LINKS

        static int64 dev;
        static int64 dev;

-       static dev_t rdev;
-@@ -439,6 +444,13 @@ static void send_file_entry(int f, struc
-               flags |= XMIT_SAME_TIME;
+@@ -450,6 +451,13 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_
+               xflags |= XMIT_SAME_TIME;

        else
                modtime = file->modtime;
        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)
 +              if (file_atime == atime)

-+                      flags |= XMIT_SAME_ATIME;
++                      xflags |= XMIT_SAME_ATIME;

 +              else
 +                      atime = file_atime;
 +      }
  
  #ifdef SUPPORT_HARD_LINKS
        if (tmp_dev != 0) {
 +              else
 +                      atime = file_atime;
 +      }
  
  #ifdef SUPPORT_HARD_LINKS
        if (tmp_dev != 0) {

-@@ -510,6 +522,8 @@ static void send_file_entry(int f, struc
+@@ -522,6 +530,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_

        }
        }

-       if (!(flags & XMIT_SAME_MODE))
+       if (!(xflags & XMIT_SAME_MODE))

                write_int(f, to_wire_mode(mode));
                write_int(f, to_wire_mode(mode));

-+      if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME))
++      if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))

 +              write_varlong(f, atime, 4);
 +              write_varlong(f, atime, 4);

-       if (preserve_uid && !(flags & XMIT_SAME_UID)) {
+       if (uid_ndx && !(xflags & XMIT_SAME_UID)) {

                if (protocol_version < 30)
                        write_int(f, uid);
                if (protocol_version < 30)
                        write_int(f, uid);

-@@ -596,7 +610,7 @@ static void send_file_entry(int f, struc
+@@ -608,7 +618,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_

  static struct file_struct *recv_file_entry(struct file_list *flist,
                                           int xflags, int f)
  {
 -      static int64 modtime;
 +      static int64 modtime, atime;
        static mode_t mode;
  static struct file_struct *recv_file_entry(struct file_list *flist,
                                           int xflags, int f)
  {
 -      static int64 modtime;
 +      static int64 modtime, atime;
        static mode_t mode;

+ #ifdef SUPPORT_HARD_LINKS

        static int64 dev;
        static int64 dev;

-       static dev_t rdev;
-@@ -731,6 +745,16 @@ static struct file_struct *recv_file_ent
+@@ -741,6 +751,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 (!(xflags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));

-+      if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) {
++      if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {

 +              atime = read_varlong(f, 4);
 +#if SIZEOF_TIME_T < SIZEOF_INT64
 +              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);
 +              }
 +                              "Access time value of %s truncated on receiver.\n",
 +                              lastname);
 +              }


@@ -112,73 +102,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);
  
        if (chmod_modes && !S_ISLNK(mode))
                mode = tweak_mode(mode, chmod_modes);

-@@ -859,6 +883,8 @@ static struct file_struct *recv_file_ent
+@@ -871,6 +891,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,

                F_GROUP(file) = gid;
                file->flags |= gid_flags;
        }
                F_GROUP(file) = gid;
                file->flags |= gid_flags;
        }

-+      if (preserve_atimes)
-+              F_ATIME(file) = (time_t)atime;
- #ifdef ICONV_OPTION
-       if (ic_ndx)
-               F_NDX(file) = flist->count + flist->ndx_start;
-@@ -1172,6 +1198,8 @@ struct file_struct *make_file(const char
++      if (atimes_ndx)
++              f_atime_set(file, (time_t)atime);
+       if (unsort_ndx)
+               F_NDX(file) = flist->used + flist->ndx_start;
+ 
+@@ -1203,6 +1225,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,

                F_OWNER(file) = st.st_uid;
                F_OWNER(file) = st.st_uid;

-       if (preserve_gid)
+       if (gid_ndx)

                F_GROUP(file) = st.st_gid;
                F_GROUP(file) = st.st_gid;

-+      if (preserve_atimes)
-+              F_ATIME(file) = st.st_atime;
++      if (atimes_ndx)
++              f_atime_set(file, st.st_atime);

  
        if (basename != thisname)
                file->dirname = lastdir;
  
        if (basename != thisname)
                file->dirname = lastdir;

---- old/generator.c
-+++ new/generator.c
-@@ -45,6 +45,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;
-@@ -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;
+@@ -605,6 +606,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre

                  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                 || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0))
                        iflags |= ITEM_REPORT_TIME;
                  && (!(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;
 +                      iflags |= ITEM_REPORT_ATIME;

-               if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS))
-                       iflags |= ITEM_REPORT_PERMS;
-               if (preserve_uid && 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)) {
+                       ;
+@@ -958,6 +962,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 (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))
 +                              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);
+                               finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);

                        if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {
                        if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) {

-@@ -1743,7 +1749,7 @@ static void touch_up_dirs(struct file_li
+@@ -1144,6 +1150,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)) {
+@@ -1158,14 +1165,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));
+       }
+ }
+@@ -1916,7 +1925,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)

                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 (!(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 && !(++j % lull_mod))
+               if (allowed_lull && !(counter % lull_mod))

                        maybe_send_keepalive();
                        maybe_send_keepalive();

-               else if (!(j % 200))
---- old/log.c
-+++ new/log.c
-@@ -34,6 +34,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;
-@@ -630,7 +631,8 @@ static void log_formatted(enum logcode c
+               else if (!(counter & 0xFF))
+diff --git a/ifuncs.h b/ifuncs.h
+--- a/ifuncs.h
++++ b/ifuncs.h
+@@ -57,6 +57,28 @@ from_wire_mode(int mode)
+       return mode;
+ }
+ 
++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
+@@ -642,7 +642,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[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p';
                        c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o';
                        c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g';


@@ -188,39 +231,36 @@ 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';
                        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_uid = 0;
+diff --git a/options.c b/options.c
+--- a/options.c
++++ b/options.c
+@@ -58,6 +58,7 @@ int preserve_specials = 0;
+ int preserve_uid = 0;

  int preserve_gid = 0;
  int preserve_times = 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;
 +int preserve_atimes = 0;
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;

-@@ -334,8 +335,9 @@ void usage(enum logcode F)
-   rprintf(F,"     --devices               preserve device files (super-user only)\n");
-   rprintf(F,"     --specials              preserve special files\n");
+@@ -348,6 +349,7 @@ void usage(enum logcode F)

    rprintf(F," -D                          same as --devices --specials\n");
    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," -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");
 +  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");

-@@ -468,6 +470,9 @@ static struct poptOption long_options[] 
-   {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
+@@ -483,6 +485,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 },
    {"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 },
-@@ -1652,6 +1657,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 },
+@@ -1725,6 +1730,8 @@ void server_options(char **args, int *argc_p)

                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';
                argstr[x++] = 'D';
        if (preserve_times)
                argstr[x++] = 't';


@@ -229,33 +269,26 @@ TODO:  need to fix this to handle 64-bit time_t values!
        if (preserve_perms)
                argstr[x++] = 'p';
        else if (preserve_executability && am_sender)
        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 omit_dir_times;
- extern int am_root;
-@@ -271,6 +272,7 @@ int set_file_attrs(const char *fname, st
+diff --git a/rsync.c b/rsync.c
+--- a/rsync.c
++++ b/rsync.c
+@@ -344,6 +344,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,

        int updated = 0;
        int updated = 0;

-       statx sx2;
+       stat_x sx2;

        int change_uid, change_gid;
 +      time_t atime, mtime;
        mode_t new_mode = file->mode;
        int change_uid, change_gid;
 +      time_t atime, mtime;
        mode_t new_mode = file->mode;

+       int inherit;

  
  

-       if (!sxp) {
-@@ -308,18 +310,36 @@ int set_file_attrs(const char *fname, st
-               set_stat_xattr(fname, file);
+@@ -387,18 +388,36 @@ 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. */
  #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) && omit_dir_times))
+       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))

                flags |= ATTRS_SKIP_MTIME;
                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) {
 +              flags |= ATTRS_SKIP_ATIME;
        if (!(flags & ATTRS_SKIP_MTIME)
            && cmp_time(sxp->st.st_mtime, file->modtime) != 0) {


@@ -265,7 +298,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
 +      } else
 +              mtime = sxp->st.st_mtime;
 +      if (!(flags & ATTRS_SKIP_ATIME)) {
 +      } 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;
 +              if (cmp_time(sxp->st.st_atime, file_atime) != 0) {
 +                      atime = file_atime;
 +                      updated = 1;


@@ -276,7 +309,7 @@ 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) {
 +      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;
                }
                                full_fname(fname));
                        goto cleanup;
                }


@@ -286,18 +319,37 @@ TODO:  need to fix this to handle 64-bit time_t values!
 +                      updated = 0;
        }
  
 +                      updated = 0;
        }
  

-       change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file);
---- old/rsync.h
-+++ new/rsync.h
-@@ -56,6 +56,7 @@
+       change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
+@@ -528,7 +547,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)
+@@ -555,7 +574,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_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 */
-+#define XMIT_SAME_ATIME (1<<13)               /* protocols ?? - NOW */
+ #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. */
  
  
  /* These flags are used in the live flist data. */
  

-@@ -143,6 +144,7 @@
+@@ -148,6 +149,7 @@

  
  #define ATTRS_REPORT          (1<<0)
  #define ATTRS_SKIP_MTIME      (1<<1)
  
  #define ATTRS_REPORT          (1<<0)
  #define ATTRS_SKIP_MTIME      (1<<1)


@@ -305,37 +357,33 @@ TODO:  need to fix this to handle 64-bit time_t values!
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0

-@@ -582,6 +584,7 @@ struct file_struct {
- extern int file_extra_cnt;
- extern int preserve_uid;
- extern int preserve_gid;
-+extern int preserve_atimes;
- extern int preserve_acls;
- extern int preserve_xattrs;
+@@ -619,12 +621,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;

  
  

-@@ -616,6 +619,7 @@ extern int preserve_xattrs;
- /* When the associated option is on, all entries will have these present: */
- #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum
- #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum
-+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
- #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num
- #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num
- #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num
---- old/rsync.yo
-+++ new/rsync.yo
-@@ -336,8 +336,9 @@ to the detailed description below for a 
-      --devices               preserve device files (super-user only)
-      --specials              preserve special files
+ #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
+@@ -349,6 +349,7 @@ to the detailed description below for a complete description.  verb(

   -D                          same as --devices --specials
   -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
 + -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

-@@ -916,6 +917,12 @@ it is preserving modification times (see
+@@ -987,6 +988,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).
  
  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).
  


@@ -348,16 +396,7 @@ 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
  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

-@@ -1530,7 +1537,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
-@@ -1539,8 +1546,10 @@ quote(itemization(
+@@ -1687,8 +1694,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).
    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).


@@ -370,56 +409,47 @@ TODO:  need to fix this to handle 64-bit time_t values!
    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).
    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;
- 
---- 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"
 +
 +#! /bin/sh
 +
 +# Test rsync copying atimes
 +
 +. "$suitedir/rsync.fns"
 +

-+set -x
-+

 +mkdir "$fromdir"
 +
 +touch "$fromdir/foo"
 +touch -a -t 200102031717.42 "$fromdir/foo"
 +
 +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
 +
 +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
-@@ -186,6 +186,10 @@ checkit() {
+diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
+--- a/testsuite/rsync.fns
++++ b/testsuite/rsync.fns
+@@ -187,6 +187,10 @@ checkit() {

      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
      # 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=$?
 +      ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
 +    fi
 +
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?

-@@ -193,10 +197,13 @@ checkit() {
+@@ -194,10 +198,13 @@ checkit() {

        failed="YES";
      fi
  
        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
 +
 +      ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
 +    fi
 +


@@ -430,18 +460,19 @@ TODO:  need to fix this to handle 64-bit time_t values!
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
  

---- old/tls.c
-+++ new/tls.c
-@@ -98,6 +98,8 @@ static int stat_xattr(const char *fname,
+diff --git a/tls.c b/tls.c
+--- a/tls.c
++++ b/tls.c
+@@ -105,6 +105,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)

  
  #endif
  
  
  #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",
 + 
  static void failed(char const *what, char const *where)
  {
        fprintf(stderr, PROGRAM ": %s %s: %s\n",

-@@ -105,12 +107,29 @@ static void failed(char const *what, cha
+@@ -112,12 +114,29 @@ static void failed(char const *what, char const *where)

        exit(1);
  }
  
        exit(1);
  }
  


@@ -473,7 +504,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
        char linkbuf[4096];
  
        if (do_lstat(fname, &buf) < 0)
        char linkbuf[4096];
  
        if (do_lstat(fname, &buf) < 0)

-@@ -147,19 +166,8 @@ static void list_file(const char *fname)
+@@ -154,19 +173,11 @@ static void list_file(const char *fname)

  
        permstring(permbuf, buf.st_mode);
  
  
        permstring(permbuf, buf.st_mode);
  


@@ -491,11 +522,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);
 -      } 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? */
  
  
        /* TODO: Perhaps escape special characters in fname? */
  

-@@ -170,13 +178,15 @@ static void list_file(const char *fname)
+@@ -177,13 +188,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);
                    (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);


@@ -503,27 +537,27 @@ 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);
 +      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 */
  }
  
  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},

  #ifdef SUPPORT_XATTRS
    {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
  #endif
  #ifdef SUPPORT_XATTRS
    {"fake-super",      'f', POPT_ARG_VAL,    &am_root, -1, 0, 0 },
  #endif

-@@ -190,6 +200,7 @@ static void tls_usage(int ret)
+@@ -197,6 +209,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,"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");

  #ifdef SUPPORT_XATTRS
    fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
  #endif
  #ifdef SUPPORT_XATTRS
    fprintf(F," -f, --fake-super            display attributes including fake-super xattrs\n");
  #endif

---- old/util.c
-+++ new/util.c
-@@ -120,7 +120,7 @@ NORETURN void overflow_exit(const char *
+diff --git a/util.c b/util.c
+--- a/util.c
++++ b/util.c
+@@ -122,7 +122,7 @@ NORETURN void overflow_exit(const char *str)

        exit_cleanup(RERR_MALLOC);
  }
  
        exit_cleanup(RERR_MALLOC);
  }
  


@@ -532,7 +566,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  {
  #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
        if (S_ISLNK(mode))
  {
  #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
        if (S_ISLNK(mode))

-@@ -128,9 +128,13 @@ int set_modtime(const char *fname, time_
+@@ -130,9 +130,13 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)

  #endif
  
        if (verbose > 2) {
  #endif
  
        if (verbose > 2) {


@@ -548,7 +582,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
        }
  
        if (dry_run)
        }
  
        if (dry_run)

-@@ -139,7 +143,7 @@ int set_modtime(const char *fname, time_
+@@ -141,7 +145,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)

        {
  #ifdef HAVE_UTIMES
                struct timeval t[2];
        {
  #ifdef HAVE_UTIMES
                struct timeval t[2];


@@ -557,9 +591,9 @@ TODO:  need to fix this to handle 64-bit time_t values!
                t[0].tv_usec = 0;
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;
                t[0].tv_usec = 0;
                t[1].tv_sec = modtime;
                t[1].tv_usec = 0;

-@@ -152,12 +156,12 @@ int set_modtime(const char *fname, time_
+@@ -155,12 +159,12 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)

                return utimes(fname, t);
                return utimes(fname, t);

- #elif defined HAVE_UTIMBUF
+ #elif defined HAVE_STRUCT_UTIMBUF

                struct utimbuf tbuf;
 -              tbuf.actime = time(NULL);
 +              tbuf.actime = atime;
                struct utimbuf tbuf;
 -              tbuf.actime = time(NULL);
 +              tbuf.actime = atime;