Improve sqlite locked-db handling.

[rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index a1885a78d91113d4e7869ec54dfb66fbde5d5b88..9ea37a81a496e7691484d0bf423339c34e71130d 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,10 +4,11 @@ To use this patch, run these commands for a successful build:
     ./configure                      (optional if already run)
     make
 
     ./configure                      (optional if already run)
     make
 

+based-on: 1e9ee19a716b72454dfeab663802c626b81cdf2e

 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c
 diff --git a/compat.c b/compat.c
 --- a/compat.c
 +++ b/compat.c

-@@ -44,6 +44,7 @@ extern int protocol_version;
+@@ -46,6 +46,7 @@ extern int protocol_version;

  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;
  extern int protect_args;
  extern int preserve_uid;
  extern int preserve_gid;


@@ -15,7 +16,7 @@ diff --git a/compat.c b/compat.c
  extern int preserve_acls;
  extern int preserve_xattrs;
  extern int need_messages_from_generator;
  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;
+@@ -63,7 +64,7 @@ extern char *iconv_opt;

  #endif
  
  /* These index values are for the file-list's extra-attribute array. */
  #endif
  
  /* These index values are for the file-list's extra-attribute array. */


@@ -23,8 +24,8 @@ diff --git a/compat.c b/compat.c
 +int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
 +int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
  
  int receiver_symlink_times = 0; /* receiver can set the time on a symlink */

- 
-@@ -134,6 +135,8 @@ void setup_protocol(int f_out,int f_in)
+ int sender_symlink_iconv = 0; /* sender should convert symlink content */
+@@ -140,6 +141,8 @@ void setup_protocol(int f_out,int f_in)

                uid_ndx = ++file_extra_cnt;
        if (preserve_gid)
                gid_ndx = ++file_extra_cnt;
                uid_ndx = ++file_extra_cnt;
        if (preserve_gid)
                gid_ndx = ++file_extra_cnt;


@@ -36,27 +37,27 @@ diff --git a/compat.c b/compat.c
 diff --git a/flist.c b/flist.c
 --- a/flist.c
 +++ b/flist.c
 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;
+@@ -53,6 +53,7 @@ extern int preserve_specials;
+ extern int delete_during;
+ extern int missing_args;

  extern int eol_nulls;
 +extern int atimes_ndx;
  extern int relative_paths;
  extern int implied_dirs;
  extern int eol_nulls;
 +extern int atimes_ndx;
  extern int relative_paths;
  extern int implied_dirs;

- extern int file_extra_cnt;
-@@ -388,7 +389,7 @@ int change_pathname(struct file_struct *file, const char *dir, int dirlen)
- 
- static void send_file_entry(int f, const char *fname, struct file_struct *file, int ndx, int first_ndx)
+ extern int ignore_perishable;
+@@ -397,7 +398,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ #endif
+                           int ndx, int first_ndx)

  {
 -      static time_t modtime;
 +      static time_t modtime, atime;
        static mode_t mode;
  #ifdef SUPPORT_HARD_LINKS
        static int64 dev;
  {
 -      static time_t modtime;
 +      static time_t modtime, atime;
        static mode_t mode;
  #ifdef SUPPORT_HARD_LINKS
        static int64 dev;

-@@ -462,6 +463,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
-               xflags |= XMIT_SAME_TIME;
-       else
+@@ -497,6 +498,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,

                modtime = file->modtime;
                modtime = file->modtime;

+       if (NSEC_BUMP(file) && protocol_version >= 31)
+               xflags |= XMIT_MOD_NSEC;

 +      if (atimes_ndx && !S_ISDIR(mode)) {
 +              time_t file_atime = f_atime(file);
 +              if (file_atime == atime)
 +      if (atimes_ndx && !S_ISDIR(mode)) {
 +              time_t file_atime = f_atime(file);
 +              if (file_atime == atime)


@@ -66,9 +67,9 @@ diff --git a/flist.c b/flist.c
 +      }
  
  #ifdef SUPPORT_HARD_LINKS
 +      }
  
  #ifdef SUPPORT_HARD_LINKS

-       if (tmp_dev != 0) {
-@@ -533,6 +541,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
-       }
+       if (tmp_dev != -1) {
+@@ -583,6 +591,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+               write_varint(f, F_MOD_NSEC(file));

        if (!(xflags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
 +      if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))
        if (!(xflags & XMIT_SAME_MODE))
                write_int(f, to_wire_mode(mode));
 +      if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME))


@@ -76,17 +77,17 @@ diff --git a/flist.c b/flist.c
        if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
                if (protocol_version < 30)
                        write_int(f, uid);
        if (preserve_uid && !(xflags & XMIT_SAME_UID)) {
                if (protocol_version < 30)
                        write_int(f, uid);

-@@ -619,7 +629,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,
-                                          int xflags, int f)
+@@ -670,7 +680,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file,
+ 
+ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags)

  {
 -      static int64 modtime;
 +      static int64 modtime, atime;
        static mode_t mode;
  #ifdef SUPPORT_HARD_LINKS
        static int64 dev;
  {
 -      static int64 modtime;
 +      static int64 modtime, atime;
        static mode_t mode;
  #ifdef SUPPORT_HARD_LINKS
        static int64 dev;

-@@ -753,6 +763,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
-       }
+@@ -814,6 +824,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x
+               modtime_nsec = 0;

        if (!(xflags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
 +      if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {
        if (!(xflags & XMIT_SAME_MODE))
                mode = from_wire_mode(read_int(f));
 +      if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) {


@@ -100,9 +101,9 @@ diff --git a/flist.c b/flist.c
 +#endif
 +      }
  
 +#endif
 +      }
  

-       if (chmod_modes && !S_ISLNK(mode))
+       if (chmod_modes && !S_ISLNK(mode) && mode)

                mode = tweak_mode(mode, chmod_modes);
                mode = tweak_mode(mode, chmod_modes);

-@@ -895,6 +915,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist,
+@@ -974,6 +994,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x

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


@@ -111,10 +112,10 @@ diff --git a/flist.c b/flist.c
        if (unsort_ndx)
                F_NDX(file) = flist->used + flist->ndx_start;
  
        if (unsort_ndx)
                F_NDX(file) = flist->used + flist->ndx_start;
  

-@@ -1241,6 +1263,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 */
+@@ -1371,6 +1393,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,

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

+       if (am_generator && st.st_uid == our_uid)
+               file->flags |= FLAG_OWNED_BY_US;

 +      if (atimes_ndx)
 +              f_atime_set(file, st.st_atime);
  
 +      if (atimes_ndx)
 +              f_atime_set(file, st.st_atime);
  


@@ -123,15 +124,7 @@ diff --git a/flist.c b/flist.c
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
 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;
-@@ -645,6 +646,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -496,6 +496,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre

                 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
                  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                        iflags |= ITEM_REPORT_TIME;
                 : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED)
                  && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname))
                        iflags |= ITEM_REPORT_TIME;


@@ -141,7 +134,7 @@ diff --git a/generator.c b/generator.c
  #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
                if (S_ISLNK(file->mode)) {
                        ;
  #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST
                if (S_ISLNK(file->mode)) {
                        ;

-@@ -1015,6 +1019,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx,
+@@ -907,6 +910,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;


@@ -149,48 +142,58 @@ diff --git a/generator.c b/generator.c
 +                              set_file_attrs(fname, file, sxp, NULL, 0);
                        if (preserve_hard_links && F_IS_HLINKED(file))
                                finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);
 +                              set_file_attrs(fname, file, sxp, NULL, 0);
                        if (preserve_hard_links && F_IS_HLINKED(file))
                                finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j);

-                       if (!maybe_ATTRS_REPORT && (verbose > 1 || stdout_format_has_i > 1)) {
-@@ -1200,6 +1206,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx,
+                       if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) {
+@@ -1109,6 +1114,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;
  static void list_file_entry(struct file_struct *f)
  {
        char permbuf[PERMSTRING_SIZE];
 +      time_t atime = atimes_ndx ? f_atime(f) : 0;

-       double len;
+       int64 len;
+       int colwidth = human_readable ? 14 : 11;

  
  

-       if (!F_IS_ACTIVE(f)) {
-@@ -1214,14 +1221,16 @@ static void list_file_entry(struct file_struct *f)
+@@ -1124,10 +1130,11 @@ static void list_file_entry(struct file_struct *f)

  
  #ifdef SUPPORT_LINKS
        if (preserve_links && S_ISLNK(f->mode)) {
  
  #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),
+-              rprintf(FINFO, "%s %*s %s %s -> %s\n",
++              rprintf(FINFO, "%s %*s %s %s %s -> %s\n",
+                       permbuf, colwidth, human_num(len),
+-                      timestring(f->modtime), f_name(f, NULL),
+-                      F_SYMLINK(f));
++                      timestring(f->modtime),

 +                      atimes_ndx ? timestring(atime) : "",
 +                      atimes_ndx ? timestring(atime) : "",

-                       f_name(f, NULL), F_SYMLINK(f));
++                      f_name(f, NULL), F_SYMLINK(f));

        } else
  #endif
        } 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) : "",
+       if (missing_args == 2 && f->mode == 0) {
+@@ -1135,9 +1142,11 @@ static void list_file_entry(struct file_struct *f)
+                       colwidth + 31, "*missing",

                        f_name(f, NULL));
                        f_name(f, NULL));

+       } else {
+-              rprintf(FINFO, "%s %*s %s %s\n",
++              rprintf(FINFO, "%s %*s %s %s %s\n",
+                       permbuf, colwidth, human_num(len),
+-                      timestring(f->modtime), f_name(f, NULL));
++                      timestring(f->modtime),
++                      atimes_ndx ? timestring(atime) : "",
++                      f_name(f, NULL));

        }
  }
        }
  }

-@@ -2056,7 +2065,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx)
+ 
+@@ -2034,7 +2043,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)
                        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);
+-                              set_modtime(fname, file->modtime, F_MOD_NSEC(file), file->mode);
++                              set_times(fname, file->modtime, F_MOD_NSEC(file), file->modtime, file->mode);

                }
                }

-               if (allowed_lull && !(counter % lull_mod))
-                       maybe_send_keepalive();
+               if (counter >= loopchk_limit) {
+                       if (allowed_lull)

 diff --git a/ifuncs.h b/ifuncs.h
 --- a/ifuncs.h
 +++ b/ifuncs.h
 diff --git a/ifuncs.h b/ifuncs.h
 --- a/ifuncs.h
 +++ b/ifuncs.h

-@@ -67,6 +67,28 @@ d_name(struct dirent *di)
- #endif
+@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb)
+       memset(xb, 0, sizeof (xbuf));

  }
  
 +static inline time_t
  }
  
 +static inline time_t


@@ -216,12 +219,12 @@ diff --git a/ifuncs.h b/ifuncs.h
 +}
 +
  static inline int
 +}
 +
  static inline int

- isDigit(const char *ptr)
+ to_wire_mode(mode_t mode)

  {
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c
  {
 diff --git a/log.c b/log.c
 --- a/log.c
 +++ b/log.c

-@@ -656,7 +656,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op,
+@@ -729,7 +729,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';


@@ -242,16 +245,16 @@ diff --git a/options.c b/options.c
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;

-@@ -353,6 +354,7 @@ void usage(enum logcode F)
+@@ -708,6 +709,7 @@ void usage(enum logcode F)
+   rprintf(F,"     --specials              preserve special files\n");

    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");
    rprintf(F," -D                          same as --devices --specials\n");
    rprintf(F," -t, --times                 preserve modification times\n");

-   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");

 +  rprintf(F," -U, --atimes                preserve access (last-used) times\n");
 +  rprintf(F," -U, --atimes                preserve access (last-used) times\n");

+   rprintf(F," -O, --omit-dir-times        omit directories from --times\n");
+   rprintf(F," -J, --omit-link-times       omit symlinks from --times\n");

    rprintf(F,"     --super                 receiver attempts super-user activities\n");
    rprintf(F,"     --super                 receiver attempts super-user activities\n");

- #ifdef SUPPORT_XATTRS
-   rprintf(F,"     --fake-super            store/recover privileged attrs using xattrs\n");
-@@ -490,6 +492,9 @@ static struct poptOption long_options[] = {
-   {"times",           't', POPT_ARG_VAL,    &preserve_times, 2, 0, 0 },
+@@ -865,6 +867,9 @@ static struct poptOption long_options[] = {
+   {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },

    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
 +  {"atimes",          'U', POPT_ARG_VAL,    &preserve_atimes, 1, 0, 0 },
    {"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 },


@@ -260,7 +263,7 @@ diff --git a/options.c b/options.c
    {"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 },
    {"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 },

-@@ -1773,6 +1778,8 @@ void server_options(char **args, int *argc_p)
+@@ -2428,6 +2433,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';


@@ -272,7 +275,7 @@ diff --git a/options.c b/options.c
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c
 diff --git a/rsync.c b/rsync.c
 --- a/rsync.c
 +++ b/rsync.c

-@@ -380,6 +380,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -458,6 +458,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,

        int updated = 0;
        stat_x sx2;
        int change_uid, change_gid;
        int updated = 0;
        stat_x sx2;
        int change_uid, change_gid;


@@ -280,19 +283,21 @@ diff --git a/rsync.c b/rsync.c
        mode_t new_mode = file->mode;
        int inherit;
  
        mode_t new_mode = file->mode;
        int inherit;
  

-@@ -423,20 +424,38 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
+@@ -496,22 +497,40 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,

                set_xattr(fname, file, fnamecmp, sxp);
  #endif
  
 +      /* This code must be the first update in the function due to
 +       * how it uses the "updated" variable. */
                set_xattr(fname, file, fnamecmp, sxp);
  #endif
  
 +      /* This code must be the first update in the function due to
 +       * how it uses the "updated" variable. */

-       if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1))
+       if (!preserve_times
+        || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
+        || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))

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

--              int ret = set_modtime(fname, file->modtime, sxp->st.st_mode);
+-              int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode);

 +              mtime = file->modtime;
 +              updated = 1;
 +      } else
 +              mtime = file->modtime;
 +              updated = 1;
 +      } else


@@ -307,7 +312,7 @@ diff --git a/rsync.c b/rsync.c
 +      } else
 +              atime = sxp->st.st_atime;
 +      if (updated) {
 +      } else
 +              atime = sxp->st.st_atime;
 +      if (updated) {

-+              int ret = set_times(fname, mtime, atime, sxp->st.st_mode);
++              int ret = set_times(fname, mtime, F_MOD_NSEC(file), atime, sxp->st.st_mode);

                if (ret < 0) {
                        rsyserr(FERROR_XFER, errno, "failed to set times on %s",
                                full_fname(fname));
                if (ret < 0) {
                        rsyserr(FERROR_XFER, errno, "failed to set times on %s",
                                full_fname(fname));


@@ -323,7 +328,7 @@ diff --git a/rsync.c b/rsync.c
        }
  
        change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);
        }
  
        change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file);

-@@ -570,7 +589,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+@@ -662,7 +681,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,
  
        /* Change permissions before putting the file into place. */
        set_file_attrs(fnametmp, file, NULL, fnamecmp,


@@ -331,8 +336,8 @@ diff --git a/rsync.c b/rsync.c
 +                     ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
  
        /* move tmp file over real file */
 +                     ok_to_set_time ? 0 : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
  
        /* move tmp file over real file */

-       if (verbose > 2)
-@@ -597,7 +616,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
+       if (DEBUG_GTE(RECV, 1))
+@@ -687,7 +706,7 @@ int finish_transfer(const char *fname, const char *fnametmp,

  
    do_set_file_attrs:
        set_file_attrs(fnametmp, file, NULL, fnamecmp,
  
    do_set_file_attrs:
        set_file_attrs(fnametmp, file, NULL, fnamecmp,


@@ -344,15 +349,15 @@ diff --git a/rsync.c b/rsync.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
 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 */
+@@ -62,6 +62,7 @@

  #define XMIT_HLINK_FIRST (1<<12)      /* protocols 30 - now (HLINKED files only) */
  #define XMIT_HLINK_FIRST (1<<12)      /* protocols 30 - now (HLINKED files only) */

-+#define XMIT_SAME_ATIME (1<<13)               /* protocols ?? - now */
+ #define XMIT_IO_ERROR_ENDLIST (1<<12) /* protocols 31*- now (w/XMIT_EXTENDED_FLAGS) (also protocol 30 w/'f' compat flag) */
+ #define XMIT_MOD_NSEC (1<<13)         /* protocols 31 - now */
++#define XMIT_SAME_ATIME (1<<14)               /* protocols ?? - now */

  
  /* These flags are used in the live flist data. */
  
  
  /* These flags are used in the live flist data. */
  

-@@ -154,6 +155,7 @@
+@@ -165,6 +166,7 @@

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


@@ -360,7 +365,7 @@ diff --git a/rsync.h b/rsync.h
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0

-@@ -630,12 +632,14 @@ extern int file_extra_cnt;
+@@ -708,12 +710,14 @@ extern int file_extra_cnt;

  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;
  extern int inc_recurse;
  extern int uid_ndx;
  extern int gid_ndx;


@@ -378,17 +383,17 @@ diff --git a/rsync.h b/rsync.h
 diff --git a/rsync.yo b/rsync.yo
 --- a/rsync.yo
 +++ b/rsync.yo
 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(
+@@ -369,6 +369,7 @@ to the detailed description below for a complete description.  verb(
+      --specials              preserve special files

   -D                          same as --devices --specials
   -t, --times                 preserve modification times
   -D                          same as --devices --specials
   -t, --times                 preserve modification times

-  -O, --omit-dir-times        omit directories from --times

 + -U, --atimes                preserve access (use) times
 + -U, --atimes                preserve access (use) times

+  -O, --omit-dir-times        omit directories from --times
+  -J, --omit-link-times       omit symlinks from --times

       --super                 receiver attempts super-user activities
       --super                 receiver attempts super-user activities

-      --fake-super            store/recover privileged attrs using xattrs
-  -S, --sparse                handle sparse files efficiently
-@@ -1000,6 +1001,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).
+@@ -1162,6 +1163,12 @@ cause the next transfer to behave as if it used bf(-I), causing all files to be
+ updated (though rsync's delta-transfer algorithm will make the update fairly efficient
+ if the files haven't actually changed, you're much better off using bf(-t)).

  
 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
 +destination files to the same value as the source files.  Note that the
  
 +dit(bf(-U, --atimes)) This tells rsync to set the access (use) times of the
 +destination files to the same value as the source files.  Note that the


@@ -396,10 +401,10 @@ diff --git a/rsync.yo b/rsync.yo
 +repeated rsync runs with --atimes may be needed if you want to force the
 +access-time values to be 100% identical on the two systems.
 +
 +repeated rsync runs with --atimes may be needed if you want to force the
 +access-time values to be 100% identical on the two systems.
 +

- dit(bf(--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
-@@ -1707,7 +1714,10 @@ quote(itemization(
+ dit(bf(-O, --omit-dir-times)) This tells rsync to omit directories when
+ 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).
+@@ -2092,7 +2099,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).


@@ -411,6 +416,88 @@ diff --git a/rsync.yo b/rsync.yo
    it() The bf(a) means that the ACL information changed.
    it() The bf(x) means that the extended attribute information changed.
  ))
    it() The bf(a) means that the ACL information changed.
    it() The bf(x) means that the extended attribute information changed.
  ))

+diff --git a/syscall.c b/syscall.c
+--- a/syscall.c
++++ b/syscall.c
+@@ -349,15 +349,15 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
+ }
+ 
+ #ifdef HAVE_UTIMENSAT
+-int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
++int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
+ {
+       struct timespec t[2];
+ 
+       if (dry_run) return 0;
+       RETURN_ERROR_IF_RO_OR_LO;
+ 
+-      t[0].tv_sec = 0;
+-      t[0].tv_nsec = UTIME_NOW;
++      t[0].tv_sec = atime;
++      t[0].tv_nsec = a_nsec;
+       t[1].tv_sec = modtime;
+       t[1].tv_nsec = mod_nsec;
+       return utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW);
+@@ -365,15 +365,15 @@ int do_utimensat(const char *fname, time_t modtime, uint32 mod_nsec)
+ #endif
+ 
+ #ifdef HAVE_LUTIMES
+-int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
++int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
+ {
+       struct timeval t[2];
+ 
+       if (dry_run) return 0;
+       RETURN_ERROR_IF_RO_OR_LO;
+ 
+-      t[0].tv_sec = time(NULL);
+-      t[0].tv_usec = 0;
++      t[0].tv_sec = atime;
++      t[0].tv_usec = a_nsec;
+       t[1].tv_sec = modtime;
+       t[1].tv_usec = mod_nsec / 1000;
+       return lutimes(fname, t);
+@@ -381,22 +381,22 @@ int do_lutimes(const char *fname, time_t modtime, uint32 mod_nsec)
+ #endif
+ 
+ #ifdef HAVE_UTIMES
+-int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec)
++int do_utimes(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, uint32 a_nsec)
+ {
+       struct timeval t[2];
+ 
+       if (dry_run) return 0;
+       RETURN_ERROR_IF_RO_OR_LO;
+ 
+-      t[0].tv_sec = time(NULL);
+-      t[0].tv_usec = 0;
++      t[0].tv_sec = atime;
++      t[0].tv_usec = a_nsec;
+       t[1].tv_sec = modtime;
+       t[1].tv_usec = mod_nsec / 1000;
+       return utimes(fname, t);
+ }
+ 
+ #elif defined HAVE_UTIME
+-int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
++int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec), time_t atime, UNUSED(uint32 a_nsec))
+ {
+ #ifdef HAVE_STRUCT_UTIMBUF
+       struct utimbuf tbuf;
+@@ -408,11 +408,11 @@ int do_utime(const char *fname, time_t modtime, UNUSED(uint32 mod_nsec))
+       RETURN_ERROR_IF_RO_OR_LO;
+ 
+ # ifdef HAVE_STRUCT_UTIMBUF
+-      tbuf.actime = time(NULL);
++      tbuf.actime = atime;
+       tbuf.modtime = modtime;
+       return utime(fname, &tbuf);
+ # else
+-      t[0] = time(NULL);
++      t[0] = atime;
+       t[1] = modtime;
+       return utime(fname, t);
+ # endif

 diff --git a/testsuite/atimes.test b/testsuite/atimes.test
 new file mode 100644
 --- /dev/null
 diff --git a/testsuite/atimes.test b/testsuite/atimes.test
 new file mode 100644
 --- /dev/null


@@ -436,7 +523,7 @@ new file mode 100644
 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
 --- a/testsuite/rsync.fns
 +++ b/testsuite/rsync.fns
 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
 --- a/testsuite/rsync.fns
 +++ b/testsuite/rsync.fns

-@@ -215,6 +215,10 @@ checkit() {
+@@ -219,6 +219,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.
  


@@ -447,8 +534,8 @@ diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?

-@@ -222,10 +226,13 @@ checkit() {
-       failed="YES";
+@@ -226,10 +230,13 @@ checkit() {
+       failed="$failed status=$status"

      fi
  
 +    if test x$TLS_ARGS != x--atimes; then
      fi
  
 +    if test x$TLS_ARGS != x--atimes; then


@@ -460,39 +547,47 @@ diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
      echo ""
 -    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
      echo ""
 -    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
      ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"

-     diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
+     diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed="$failed dir-diff"

  
 diff --git a/tls.c b/tls.c
 --- a/tls.c
 +++ b/tls.c
  
 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)
+@@ -110,6 +110,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst)

  
  #endif
  
 +static int display_atimes = 0;
  
  #endif
  
 +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",

-@@ -114,12 +116,29 @@ static void failed(char const *what, char const *where)
+@@ -117,12 +119,37 @@ static void failed(char const *what, char const *where)

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

-+static void storetime(char *dest, time_t t, size_t destsize)
++static void storetime(char *dest, size_t destsize, time_t t, int nsecs)

 +{
 +      if (t) {
 +{
 +      if (t) {

++              int len;

 +              struct tm *mt = gmtime(&t);
 +
 +              struct tm *mt = gmtime(&t);
 +

-+              snprintf(dest, destsize,
-+                      "%04d-%02d-%02d %02d:%02d:%02d ",
++              len = snprintf(dest, destsize,
++                      "%04d-%02d-%02d %02d:%02d:%02d",

 +                      (int)mt->tm_year + 1900,
 +                      (int)mt->tm_mon + 1,
 +                      (int)mt->tm_mday,
 +                      (int)mt->tm_hour,
 +                      (int)mt->tm_min,
 +                      (int)mt->tm_sec);
 +                      (int)mt->tm_year + 1900,
 +                      (int)mt->tm_mon + 1,
 +                      (int)mt->tm_mday,
 +                      (int)mt->tm_hour,
 +                      (int)mt->tm_min,
 +                      (int)mt->tm_sec);

-+      } else
-+              strlcpy(dest, "                    ", destsize);
++              if (nsecs >= 0) {
++                      snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs);
++              }
++      } else {
++              int has_nsecs = nsecs >= 0 ? 1 : 0;
++              int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
++              memset(datebuf, ' ', len);
++              datebuf[len] = '\0';
++      }

 +}
 +
  static void list_file(const char *fname)
 +}
 +
  static void list_file(const char *fname)


@@ -506,14 +601,16 @@ diff --git a/tls.c b/tls.c
        char linkbuf[4096];
  
        if (do_lstat(fname, &buf) < 0)
        char linkbuf[4096];
  
        if (do_lstat(fname, &buf) < 0)

-@@ -158,19 +177,11 @@ static void list_file(const char *fname)
+@@ -160,30 +187,17 @@ static void list_file(const char *fname)
+       }

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

- 
+-

 -      if (buf.st_mtime) {
 -      if (buf.st_mtime) {

+-              int len;

 -              mt = gmtime(&buf.st_mtime);
 -
 -              mt = gmtime(&buf.st_mtime);
 -

--              snprintf(datebuf, sizeof datebuf,
+-              len = snprintf(datebuf, sizeof datebuf,

 -                      "%04d-%02d-%02d %02d:%02d:%02d",
 -                      (int)mt->tm_year + 1900,
 -                      (int)mt->tm_mon + 1,
 -                      "%04d-%02d-%02d %02d:%02d:%02d",
 -                      (int)mt->tm_year + 1900,
 -                      (int)mt->tm_mon + 1,


@@ -521,20 +618,33 @@ diff --git a/tls.c b/tls.c
 -                      (int)mt->tm_hour,
 -                      (int)mt->tm_min,
 -                      (int)mt->tm_sec);
 -                      (int)mt->tm_hour,
 -                      (int)mt->tm_min,
 -                      (int)mt->tm_sec);

--      } else
--              strlcpy(datebuf, "                   ", sizeof datebuf);
-+      storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf);
+ #ifdef ST_MTIME_NSEC
+-              if (nsec_times) {
+-                      snprintf(datebuf + len, sizeof datebuf - len,
+-                              ".%09d", (int)buf.ST_MTIME_NSEC);
+-              }
++      if (nsec_times)
++              nsecs = (int)buf.ST_MTIME_NSEC
++      else
+ #endif
+-      } else {
+-              int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1);
+-              memset(datebuf, ' ', len);
+-              datebuf[len] = '\0';
+-      }
++              nsecs = -1;
++      storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs);

 +      if (display_atimes)
 +      if (display_atimes)

-+              storetime(atimebuf, S_ISDIR(buf.st_mode) ? 0 : buf.st_atime, sizeof atimebuf);
++              storetime(atimebuf, sizeof atimebuf, S_ISDIR(buf.st_mode) ? 0 : buf.st_atime, -1);

 +      else
 +              atimebuf[0] = '\0';
  
        /* TODO: Perhaps escape special characters in fname? */
  
 +      else
 +              atimebuf[0] = '\0';
  
        /* TODO: Perhaps escape special characters in fname? */
  

-@@ -181,13 +192,14 @@ static void list_file(const char *fname)
+@@ -194,13 +208,14 @@ static void list_file(const char *fname)

                    (long)minor(buf.st_rdev));
                    (long)minor(buf.st_rdev));

-       } else /* NB: use double for size since it might not fit in a long. */
-               printf("%12.0f", (double)buf.st_size);
+       } else
+               printf("%15s", do_big_num(buf.st_size, 1, NULL));

 -      printf(" %6ld.%-6ld %6ld %s %s%s\n",
 +      printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
               (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,
 -      printf(" %6ld.%-6ld %6ld %s %s%s\n",
 +      printf(" %6ld.%-6ld %6ld %s%s%s%s\n",
               (long)buf.st_uid, (long)buf.st_gid, (long)buf.st_nlink,


@@ -548,7 +658,7 @@ diff --git a/tls.c b/tls.c
    {"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
    {"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)
+@@ -219,6 +234,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");


@@ -559,19 +669,16 @@ diff --git a/tls.c b/tls.c
 diff --git a/util.c b/util.c
 --- a/util.c
 +++ b/util.c
 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);
- }
+@@ -127,20 +127,24 @@ NORETURN void overflow_exit(const char *str)

  
  

--int set_modtime(const char *fname, time_t modtime, mode_t mode)
-+int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode)
+ /* This returns 0 for success, 1 for a symlink if symlink time-setting
+  * is not possible, or -1 for any other error. */
+-int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
++int set_times(const char *fname, time_t modtime, uint32 mod_nsec, time_t atime, mode_t mode)

  {
  {

- #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES
-       if (S_ISLNK(mode))
-@@ -131,9 +131,13 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
- #endif
+       static int switch_step = 0;

  
  

-       if (verbose > 2) {
+       if (DEBUG_GTE(TIME, 1)) {

 -              rprintf(FINFO, "set modtime of %s to (%ld) %s",
 +              char mtimebuf[200];
 +
 -              rprintf(FINFO, "set modtime of %s to (%ld) %s",
 +              char mtimebuf[200];
 +


@@ -583,28 +690,33 @@ diff --git a/util.c b/util.c
 +                      mtimebuf, (long)atime, timestring(atime));
        }
  
 +                      mtimebuf, (long)atime, timestring(atime));
        }
  

-       if (dry_run)
-@@ -142,7 +146,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
-       {
+       switch (switch_step) {
+ #ifdef HAVE_UTIMENSAT
+ #include "case_N.h"
+-              if (do_utimensat(fname, modtime, mod_nsec) == 0)
++              if (do_utimensat(fname, modtime, mod_nsec, atime, 0) == 0)
+                       break;
+               if (errno != ENOSYS)
+                       return -1;
+@@ -150,7 +154,7 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
+ 
+ #ifdef HAVE_LUTIMES
+ #include "case_N.h"
+-              if (do_lutimes(fname, modtime, mod_nsec) == 0)
++              if (do_lutimes(fname, modtime, mod_nsec, atime, 0) == 0)
+                       break;
+               if (errno != ENOSYS)
+                       return -1;
+@@ -169,10 +173,10 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode)
+ 
+ #include "case_N.h"

  #ifdef HAVE_UTIMES
  #ifdef HAVE_UTIMES

-               struct timeval t[2];
--              t[0].tv_sec = time(NULL);
-+              t[0].tv_sec = atime;
-               t[0].tv_usec = 0;
-               t[1].tv_sec = modtime;
-               t[1].tv_usec = 0;
-@@ -156,12 +160,12 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode)
-               return utimes(fname, t);
- #elif defined HAVE_STRUCT_UTIMBUF
-               struct utimbuf tbuf;
--              tbuf.actime = time(NULL);
-+              tbuf.actime = atime;
-               tbuf.modtime = modtime;
-               return utime(fname,&tbuf);
- #elif defined HAVE_UTIME
-               time_t t[2];
--              t[0] = time(NULL);
-+              t[0] = atime;
-               t[1] = modtime;
-               return utime(fname,t);
+-              if (do_utimes(fname, modtime, mod_nsec) == 0)
++              if (do_utimes(fname, modtime, mod_nsec, atime, 0) == 0)
+                       break;

  #else
  #else

+-              if (do_utime(fname, modtime, mod_nsec) == 0)
++              if (do_utime(fname, modtime, mod_nsec, atime, 0) == 0)
+                       break;
+ #endif
+