X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fc5573623194fab2a331d1ffc8d284c9e25e06e7..c1ff70aa47e11c5b37634479a0facee775a7b6d9:/atimes.diff diff --git a/atimes.diff b/atimes.diff index effc37d..e8ef66c 100644 --- a/atimes.diff +++ b/atimes.diff @@ -4,11 +4,11 @@ To use this patch, run these commands for a successful build: ./configure (optional if already run) make +based-on: a01e3b490eb36ccf9e704840e1b6683dab867550 diff --git a/compat.c b/compat.c -index 6e00072..795e6bd 100644 --- a/compat.c +++ b/compat.c -@@ -43,6 +43,7 @@ extern int protocol_version; +@@ -44,6 +44,7 @@ extern int protocol_version; extern int protect_args; extern int preserve_uid; extern int preserve_gid; @@ -16,7 +16,7 @@ index 6e00072..795e6bd 100644 extern int preserve_acls; extern int preserve_xattrs; extern int need_messages_from_generator; -@@ -60,7 +61,7 @@ extern char *iconv_opt; +@@ -61,7 +62,7 @@ extern char *iconv_opt; #endif /* These index values are for the file-list's extra-attribute array. */ @@ -25,7 +25,7 @@ index 6e00072..795e6bd 100644 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */ int sender_symlink_iconv = 0; /* sender should convert symlink content */ -@@ -136,6 +137,8 @@ void setup_protocol(int f_out,int f_in) +@@ -138,6 +139,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -35,7 +35,6 @@ index 6e00072..795e6bd 100644 acls_ndx = ++file_extra_cnt; if (preserve_xattrs) diff --git a/flist.c b/flist.c -index 09b4fc5..169e918 100644 --- a/flist.c +++ b/flist.c @@ -55,6 +55,7 @@ extern int missing_args; @@ -46,7 +45,7 @@ index 09b4fc5..169e918 100644 extern int relative_paths; extern int implied_dirs; extern int file_extra_cnt; -@@ -396,7 +397,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, +@@ -406,7 +407,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, #endif int ndx, int first_ndx) { @@ -55,10 +54,10 @@ index 09b4fc5..169e918 100644 static mode_t mode; #ifdef SUPPORT_HARD_LINKS static int64 dev; -@@ -484,6 +485,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, - xflags |= XMIT_SAME_TIME; - else +@@ -506,6 +507,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, modtime = file->modtime; + if (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) @@ -69,8 +68,8 @@ index 09b4fc5..169e918 100644 #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -568,6 +576,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, - } +@@ -592,6 +600,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, + write_varint(f, F_MOD_NSEC(file)); if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); + if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) @@ -78,17 +77,17 @@ index 09b4fc5..169e918 100644 if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -654,7 +664,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) +@@ -677,7 +687,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, + + static struct file_struct *recv_file_entry(int f, struct file_list *flist, int xflags) { - static int64 modtime; + static int64 modtime, atime; static mode_t mode; #ifdef SUPPORT_HARD_LINKS static int64 dev; -@@ -793,6 +803,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, - } +@@ -821,6 +831,16 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x + modtime_nsec = 0; if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); + if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) { @@ -104,7 +103,7 @@ index 09b4fc5..169e918 100644 if (chmod_modes && !S_ISLNK(mode) && mode) mode = tweak_mode(mode, chmod_modes); -@@ -942,6 +962,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -981,6 +1001,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x F_GROUP(file) = gid; file->flags |= gid_flags; } @@ -113,7 +112,7 @@ index 09b4fc5..169e918 100644 if (unsort_ndx) F_NDX(file) = flist->used + flist->ndx_start; -@@ -1327,6 +1349,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, +@@ -1376,6 +1398,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, F_OWNER(file) = st.st_uid; if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */ F_GROUP(file) = st.st_gid; @@ -123,10 +122,9 @@ index 09b4fc5..169e918 100644 if (basename != thisname) file->dirname = lastdir; diff --git a/generator.c b/generator.c -index 12007a1..7d15744 100644 --- a/generator.c +++ b/generator.c -@@ -455,6 +455,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre +@@ -454,6 +454,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED) && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) iflags |= ITEM_REPORT_TIME; @@ -136,7 +134,7 @@ index 12007a1..7d15744 100644 #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST if (S_ISLNK(file->mode)) { ; -@@ -825,6 +828,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, +@@ -824,6 +827,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, if (link_dest) { if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; @@ -145,7 +143,7 @@ index 12007a1..7d15744 100644 if (preserve_hard_links && F_IS_HLINKED(file)) finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); if (!maybe_ATTRS_REPORT && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) { -@@ -1010,6 +1015,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, +@@ -1016,6 +1021,7 @@ static int try_dests_non(struct file_struct *file, char *fname, int ndx, static void list_file_entry(struct file_struct *f) { char permbuf[PERMSTRING_SIZE]; @@ -153,7 +151,7 @@ index 12007a1..7d15744 100644 int64 len; int colwidth = human_readable ? 14 : 11; -@@ -1025,10 +1031,11 @@ static void list_file_entry(struct file_struct *f) +@@ -1031,10 +1037,11 @@ static void list_file_entry(struct file_struct *f) #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { @@ -168,7 +166,7 @@ index 12007a1..7d15744 100644 } else #endif if (missing_args == 2 && f->mode == 0) { -@@ -1036,9 +1043,11 @@ static void list_file_entry(struct file_struct *f) +@@ -1042,9 +1049,11 @@ static void list_file_entry(struct file_struct *f) colwidth + 31, "*missing", f_name(f, NULL)); } else { @@ -182,21 +180,20 @@ index 12007a1..7d15744 100644 } } -@@ -1875,7 +1884,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) +@@ -1924,7 +1933,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) STRUCT_STAT st; if (link_stat(fname, &st, 0) == 0 && cmp_time(st.st_mtime, file->modtime) != 0) -- set_modtime(fname, file->modtime, 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 (counter >= loopchk_limit) { if (allowed_lull) diff --git a/ifuncs.h b/ifuncs.h -index 8c128d5..7834d3a 100644 --- a/ifuncs.h +++ b/ifuncs.h -@@ -35,6 +35,28 @@ realloc_xbuf(xbuf *xb, size_t sz) - xb->size = sz; +@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb) + memset(xb, 0, sizeof (xbuf)); } +static inline time_t @@ -225,10 +222,9 @@ index 8c128d5..7834d3a 100644 to_wire_mode(mode_t mode) { diff --git a/log.c b/log.c -index a687375..0f714ad 100644 --- a/log.c +++ b/log.c -@@ -715,7 +715,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op, +@@ -733,7 +733,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op, c[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; c[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; c[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; @@ -239,7 +235,6 @@ index a687375..0f714ad 100644 c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; c[11] = '\0'; diff --git a/options.c b/options.c -index e7c6c61..01ccf5a 100644 --- a/options.c +++ b/options.c @@ -59,6 +59,7 @@ int preserve_specials = 0; @@ -250,7 +245,7 @@ index e7c6c61..01ccf5a 100644 int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -698,6 +699,7 @@ void usage(enum logcode F) +@@ -699,6 +700,7 @@ void usage(enum logcode F) rprintf(F," -D same as --devices --specials\n"); rprintf(F," -t, --times preserve modification times\n"); rprintf(F," -O, --omit-dir-times omit directories from --times\n"); @@ -258,7 +253,7 @@ index e7c6c61..01ccf5a 100644 rprintf(F," --super receiver attempts super-user activities\n"); #ifdef SUPPORT_XATTRS rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); -@@ -845,6 +847,9 @@ static struct poptOption long_options[] = { +@@ -846,6 +848,9 @@ static struct poptOption long_options[] = { {"times", 't', POPT_ARG_VAL, &preserve_times, 2, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, @@ -268,7 +263,7 @@ index e7c6c61..01ccf5a 100644 {"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 }, -@@ -2289,6 +2294,8 @@ void server_options(char **args, int *argc_p) +@@ -2341,6 +2346,8 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -278,10 +273,9 @@ index e7c6c61..01ccf5a 100644 argstr[x++] = 'p'; else if (preserve_executability && am_sender) diff --git a/rsync.c b/rsync.c -index 2c026a2..95a6ebe 100644 --- a/rsync.c +++ b/rsync.c -@@ -384,6 +384,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -451,6 +451,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; @@ -289,7 +283,7 @@ index 2c026a2..95a6ebe 100644 mode_t new_mode = file->mode; int inherit; -@@ -422,20 +423,38 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -489,20 +490,38 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, set_xattr(fname, file, fnamecmp, sxp); #endif @@ -301,7 +295,7 @@ index 2c026a2..95a6ebe 100644 + 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 @@ -316,7 +310,7 @@ index 2c026a2..95a6ebe 100644 + } 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)); @@ -332,7 +326,7 @@ index 2c026a2..95a6ebe 100644 } 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, +@@ -639,7 +658,7 @@ int finish_transfer(const char *fname, const char *fnametmp, /* Change permissions before putting the file into place. */ set_file_attrs(fnametmp, file, NULL, fnamecmp, @@ -341,7 +335,7 @@ index 2c026a2..95a6ebe 100644 /* move tmp file over real file */ if (DEBUG_GTE(RECV, 1)) -@@ -597,7 +616,7 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -666,7 +685,7 @@ int finish_transfer(const char *fname, const char *fnametmp, do_set_file_attrs: set_file_attrs(fnametmp, file, NULL, fnamecmp, @@ -351,18 +345,17 @@ index 2c026a2..95a6ebe 100644 if (temp_copy_name) { if (do_rename(fnametmp, fname) < 0) { diff --git a/rsync.h b/rsync.h -index be7cf8a..2f85dee 100644 --- a/rsync.h +++ b/rsync.h -@@ -61,6 +61,7 @@ - #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_IO_ERROR_ENDLIST (1<<12) /* protocols 31 - now (w/XMIT_EXTENDED_FLAGS) */ -+#define XMIT_SAME_ATIME (1<<13) /* protocols ?? - now */ + #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. */ -@@ -155,6 +156,7 @@ +@@ -160,6 +161,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -370,7 +363,7 @@ index be7cf8a..2f85dee 100644 #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -652,12 +654,14 @@ extern int file_extra_cnt; +@@ -664,12 +666,14 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -386,7 +379,6 @@ index be7cf8a..2f85dee 100644 #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 -index 941f7a5..ec98c6e 100644 --- a/rsync.yo +++ b/rsync.yo @@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb( @@ -397,7 +389,7 @@ index 941f7a5..ec98c6e 100644 --super receiver attempts super-user activities --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently -@@ -1071,6 +1072,12 @@ it is preserving modification times (see bf(--times)). If NFS is sharing +@@ -1078,6 +1079,12 @@ it is preserving modification times (see bf(--times)). If NFS is sharing the directories on the receiving side, it is a good idea to use bf(-O). This option is inferred if you use bf(--backup) without bf(--backup-dir). @@ -410,7 +402,7 @@ index 941f7a5..ec98c6e 100644 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 -@@ -1888,7 +1895,10 @@ quote(itemization( +@@ -1945,7 +1952,10 @@ quote(itemization( sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). @@ -424,7 +416,6 @@ index 941f7a5..ec98c6e 100644 )) diff --git a/testsuite/atimes.test b/testsuite/atimes.test new file mode 100644 -index 0000000..bd3f292 --- /dev/null +++ b/testsuite/atimes.test @@ -0,0 +1,17 @@ @@ -446,10 +437,9 @@ index 0000000..bd3f292 +# The script would have aborted on error, so getting here means we've won. +exit 0 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns -index b26aee3..0c1c7d8 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns -@@ -215,6 +215,10 @@ checkit() { +@@ -218,6 +218,10 @@ checkit() { # We can just write everything to stdout/stderr, because the # wrapper hides it unless there is a problem. @@ -460,7 +450,7 @@ index b26aee3..0c1c7d8 100644 echo "Running: \"$1\"" eval "$1" status=$? -@@ -222,10 +226,13 @@ checkit() { +@@ -225,10 +229,13 @@ checkit() { failed="YES"; fi @@ -476,10 +466,9 @@ index b26aee3..0c1c7d8 100644 diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES diff --git a/tls.c b/tls.c -index 8cc5748..c27c97f 100644 --- a/tls.c +++ b/tls.c -@@ -108,6 +108,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) +@@ -118,6 +118,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) #endif @@ -488,25 +477,33 @@ index 8cc5748..c27c97f 100644 static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", -@@ -115,12 +117,29 @@ static void failed(char const *what, char const *where) +@@ -125,12 +127,37 @@ static void failed(char const *what, char const *where) 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) { ++ int len; + 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); -+ } 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) @@ -520,14 +517,16 @@ index 8cc5748..c27c97f 100644 char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -159,19 +178,11 @@ static void list_file(const char *fname) +@@ -168,30 +195,17 @@ static void list_file(const char *fname) + } permstring(permbuf, buf.st_mode); - +- - if (buf.st_mtime) { +- int len; - mt = gmtime(&buf.st_mtime); - -- 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, @@ -535,17 +534,30 @@ index 8cc5748..c27c97f 100644 - (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) -+ 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? */ -@@ -182,13 +193,14 @@ static void list_file(const char *fname) +@@ -202,13 +216,14 @@ static void list_file(const char *fname) (long)minor(buf.st_rdev)); } else printf("%15s", do_big_num(buf.st_size, 1, NULL)); @@ -562,7 +574,7 @@ index 8cc5748..c27c97f 100644 {"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 -@@ -204,6 +216,7 @@ static void tls_usage(int ret) +@@ -227,6 +242,7 @@ static void tls_usage(int ret) fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n"); fprintf(F,"Trivial file listing program for portably checking rsync\n"); fprintf(F,"\nOptions:\n"); @@ -571,19 +583,18 @@ index 8cc5748..c27c97f 100644 fprintf(F," -L, --link-owner display the owner+group on a symlink\n"); #ifdef SUPPORT_XATTRS diff --git a/util.c b/util.c -index 0cafed6..05f6d72 100644 --- a/util.c +++ b/util.c @@ -123,7 +123,7 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } --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) +-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 + #ifndef CAN_SET_SYMLINK_TIMES if (S_ISLNK(mode)) -@@ -131,9 +131,13 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -131,9 +131,13 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) #endif if (DEBUG_GTE(TIME, 1)) { @@ -599,17 +610,28 @@ index 0cafed6..05f6d72 100644 } if (dry_run) -@@ -142,7 +146,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -142,8 +146,8 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) { - #ifdef HAVE_UTIMES + #ifdef HAVE_UTIMENSAT + struct timespec t[2]; +- t[0].tv_sec = 0; +- t[0].tv_nsec = UTIME_NOW; ++ t[0].tv_sec = atime; ++ t[0].tv_nsec = 0; + t[1].tv_sec = modtime; + t[1].tv_nsec = mod_nsec; + if (utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW) < 0) +@@ -151,7 +155,7 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) + return 0; + #elif defined HAVE_UTIMES || defined HAVE_LUTIMES struct timeval t[2]; - t[0].tv_sec = time(NULL); + t[0].tv_sec = atime; t[0].tv_usec = 0; t[1].tv_sec = modtime; - t[1].tv_usec = 0; -@@ -156,12 +160,12 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) - return utimes(fname, t); + t[1].tv_usec = mod_nsec / 1000; +@@ -164,12 +168,12 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) + # endif #elif defined HAVE_STRUCT_UTIMBUF struct utimbuf tbuf; - tbuf.actime = time(NULL);