X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/85096e5eda83525eadddc9c6b1bc8135ac22e54a..7170ca8dba0a407cd0c91b41b48163c7b682abb1:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 66b8404..4bc51f5 100644 --- 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 +based-on: 181c9faf928faad08ef095f4667afe460ec3bef6 diff --git a/compat.c b/compat.c --- a/compat.c +++ b/compat.c -@@ -44,6 +44,7 @@ extern int protocol_version; +@@ -43,6 +43,7 @@ extern int protocol_version; 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; -@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv; +@@ -60,7 +61,7 @@ extern char *iconv_opt; #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 */ - -@@ -134,6 +135,8 @@ void setup_protocol(int f_out,int f_in) + int sender_symlink_iconv = 0; /* sender should convert symlink content */ +@@ -136,6 +137,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -36,7 +37,7 @@ diff --git a/compat.c b/compat.c diff --git a/flist.c b/flist.c --- a/flist.c +++ b/flist.c -@@ -53,6 +53,7 @@ extern int preserve_specials; +@@ -55,6 +55,7 @@ extern int missing_args; extern int uid_ndx; extern int gid_ndx; extern int eol_nulls; @@ -44,16 +45,16 @@ diff --git a/flist.c b/flist.c extern int relative_paths; extern int implied_dirs; extern int file_extra_cnt; -@@ -342,7 +343,7 @@ int push_pathname(const char *dir, int len) - - static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx) +@@ -396,7 +397,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; -@@ -450,6 +451,13 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ +@@ -494,6 +495,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, xflags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -67,16 +68,16 @@ diff --git a/flist.c b/flist.c #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -522,6 +530,8 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ +@@ -578,6 +586,8 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); + if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) + write_varlong(f, atime, 4); - if (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (preserve_uid && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -608,7 +618,7 @@ static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ +@@ -664,7 +674,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) { @@ -85,7 +86,7 @@ diff --git a/flist.c b/flist.c static mode_t mode; #ifdef SUPPORT_HARD_LINKS static int64 dev; -@@ -741,6 +751,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -802,6 +812,16 @@ static struct file_struct *recv_file_entry(struct file_list *flist, } if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -100,9 +101,9 @@ diff --git a/flist.c b/flist.c +#endif + } - if (chmod_modes && !S_ISLNK(mode)) + if (chmod_modes && !S_ISLNK(mode) && mode) mode = tweak_mode(mode, chmod_modes); -@@ -871,6 +891,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, +@@ -952,6 +972,8 @@ static struct file_struct *recv_file_entry(struct file_list *flist, F_GROUP(file) = gid; file->flags |= gid_flags; } @@ -111,9 +112,9 @@ diff --git a/flist.c b/flist.c 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, +@@ -1337,6 +1359,8 @@ struct file_struct *make_file(const char *fname, struct file_list *flist, F_OWNER(file) = st.st_uid; - if (gid_ndx) + if (gid_ndx) /* Check gid_ndx instead of preserve_gid for del support */ F_GROUP(file) = st.st_gid; + if (atimes_ndx) + f_atime_set(file, st.st_atime); @@ -123,17 +124,9 @@ diff --git a/flist.c b/flist.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; -@@ -613,6 +614,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre +@@ -455,6 +455,9 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre + : iflags & (ITEM_TRANSFER|ITEM_LOCAL_CHANGE) && !(iflags & ITEM_MATCHED) && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; + if (atimes_ndx && !S_ISDIR(file->mode) && !S_ISLNK(file->mode) + && cmp_time(f_atime(file), sxp->st.st_atime) != 0) @@ -141,7 +134,7 @@ diff --git a/generator.c b/generator.c #if !defined HAVE_LCHMOD && !defined HAVE_SETATTRLIST if (S_ISLNK(file->mode)) { ; -@@ -967,6 +971,8 @@ static int try_dests_reg(struct file_struct *file, char *fname, int ndx, +@@ -825,6 +828,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; @@ -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); - if (!maybe_ATTRS_REPORT && (verbose > 1 || stdout_format_has_i > 1)) { -@@ -1153,6 +1159,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)) { +@@ -1010,6 +1015,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; + int64 len; + int colwidth = human_readable ? 14 : 11; - if (!F_IS_ACTIVE(f)) { -@@ -1167,14 +1174,16 @@ static void list_file_entry(struct file_struct *f) +@@ -1025,10 +1031,11 @@ 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), +- rprintf(FINFO, "%s %*s %s %s -> %s\n", ++ rprintf(FINFO, "%s %*s %s %s %s -> %s\n", + permbuf, colwidth, comma_num(len), +- timestring(f->modtime), f_name(f, NULL), +- F_SYMLINK(f)); ++ timestring(f->modtime), + atimes_ndx ? timestring(atime) : "", - f_name(f, NULL), F_SYMLINK(f)); ++ 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) : "", + if (missing_args == 2 && f->mode == 0) { +@@ -1036,9 +1043,11 @@ static void list_file_entry(struct file_struct *f) + colwidth + 31, "*missing", f_name(f, NULL)); + } else { +- rprintf(FINFO, "%s %*s %s %s\n", ++ rprintf(FINFO, "%s %*s %s %s %s\n", + permbuf, colwidth, comma_num(len), +- timestring(f->modtime), f_name(f, NULL)); ++ timestring(f->modtime), ++ atimes_ndx ? timestring(atime) : "", ++ f_name(f, NULL)); } } -@@ -1929,7 +1938,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 (allowed_lull && !(counter % lull_mod)) - maybe_send_keepalive(); - else if (!(counter & 0xFF)) + +@@ -1870,7 +1879,7 @@ static void touch_up_dirs(struct file_list *flist, int ndx) + STRUCT_STAT st; + if (link_stat(fname, &st, 0) == 0 + && cmp_time(st.st_mtime, file->modtime) != 0) +- set_modtime(fname, file->modtime, file->mode); ++ set_times(fname, file->modtime, file->modtime, file->mode); + } + if (counter >= loopchk_limit) { + if (allowed_lull) diff --git a/ifuncs.h b/ifuncs.h --- a/ifuncs.h +++ b/ifuncs.h -@@ -57,6 +57,28 @@ from_wire_mode(int mode) - return mode; +@@ -35,6 +35,28 @@ realloc_xbuf(xbuf *xb, size_t sz) + xb->size = sz; } +static inline time_t @@ -216,12 +219,12 @@ diff --git a/ifuncs.h b/ifuncs.h +} + 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 -@@ -644,7 +644,8 @@ static void log_formatted(enum logcode code, const char *format, const char *op, +@@ -715,7 +715,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'; @@ -234,7 +237,7 @@ diff --git a/log.c b/log.c diff --git a/options.c b/options.c --- a/options.c +++ b/options.c -@@ -58,6 +58,7 @@ int preserve_specials = 0; +@@ -59,6 +59,7 @@ int preserve_specials = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; @@ -242,7 +245,7 @@ diff --git a/options.c b/options.c int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -352,6 +353,7 @@ void usage(enum logcode F) +@@ -698,6 +699,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"); @@ -250,7 +253,7 @@ diff --git a/options.c b/options.c rprintf(F," --super receiver attempts super-user activities\n"); #ifdef SUPPORT_XATTRS rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); -@@ -487,6 +489,9 @@ static struct poptOption long_options[] = { +@@ -845,6 +847,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 }, @@ -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 }, -@@ -1747,6 +1752,8 @@ void server_options(char **args, int *argc_p) +@@ -2306,6 +2311,8 @@ void server_options(char **args, int *argc_p) 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 -@@ -345,6 +345,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -384,6 +384,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; @@ -280,7 +283,7 @@ diff --git a/rsync.c b/rsync.c mode_t new_mode = file->mode; int inherit; -@@ -388,20 +389,39 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, +@@ -422,20 +423,38 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, set_xattr(fname, file, fnamecmp, sxp); #endif @@ -315,17 +318,15 @@ diff --git a/rsync.c b/rsync.c } - if (ret == 0) /* ret == 1 if symlink could not be set */ - updated = 1; -- else if (receiver_symlink_times) -- file->flags |= FLAG_TIME_FAILED; +- else + if (ret > 0) { /* ret == 1 if symlink could not be set */ + updated = 0; -+ if (receiver_symlink_times) -+ file->flags |= FLAG_TIME_FAILED; + file->flags |= FLAG_TIME_FAILED; + } } change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); -@@ -531,7 +551,7 @@ int finish_transfer(const char *fname, const char *fnametmp, +@@ -570,7 +589,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, @@ -333,8 +334,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 */ - if (verbose > 2) -@@ -558,7 +578,7 @@ int finish_transfer(const char *fname, const char *fnametmp, + if (DEBUG_GTE(RECV, 1)) +@@ -597,7 +616,7 @@ int finish_transfer(const char *fname, const char *fnametmp, do_set_file_attrs: set_file_attrs(fnametmp, file, NULL, fnamecmp, @@ -346,15 +347,15 @@ diff --git a/rsync.c b/rsync.c 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 */ +@@ -61,6 +61,7 @@ #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ #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 */ /* These flags are used in the live flist data. */ -@@ -149,6 +150,7 @@ +@@ -155,6 +156,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -362,7 +363,7 @@ diff --git a/rsync.h b/rsync.h #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -620,12 +622,14 @@ extern int file_extra_cnt; +@@ -656,12 +658,14 @@ extern int file_extra_cnt; extern int inc_recurse; extern int uid_ndx; extern int gid_ndx; @@ -380,7 +381,7 @@ diff --git a/rsync.h b/rsync.h 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( +@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb( -D same as --devices --specials -t, --times preserve modification times -O, --omit-dir-times omit directories from --times @@ -388,7 +389,7 @@ diff --git a/rsync.yo b/rsync.yo --super receiver attempts super-user activities --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently -@@ -987,6 +988,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). @@ -401,19 +402,18 @@ diff --git a/rsync.yo b/rsync.yo 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 -@@ -1689,8 +1696,10 @@ quote(itemization( +@@ -1907,7 +1914,10 @@ quote(itemization( sender's value (requires bf(--owner) and super-user privileges). it() A bf(g) means the group is different and is being updated to the sender's value (requires bf(--group) and the authority to set the group). -- it() The bf(u) slot is reserved for reporting update (access) time changes -- (a feature that is not yet released). +- it() The bf(u) slot is reserved for future use. + it() A bf(u) means the access (use) time is different and is being updated to + the sender's value (requires bf(--atimes)). An alternate value of bf(U) + means that the access time will be set to the transfer time, which happens + when a symlink or directory is updated. it() The bf(a) means that the ACL information changed. - it() The bf(x) slot is reserved for reporting extended attribute changes - (a feature that is not yet released). + it() The bf(x) means that the extended attribute information changed. + )) diff --git a/testsuite/atimes.test b/testsuite/atimes.test new file mode 100644 --- /dev/null @@ -439,7 +439,7 @@ new file mode 100644 diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns -@@ -187,6 +187,10 @@ checkit() { +@@ -215,6 +215,10 @@ checkit() { # We can just write everything to stdout/stderr, because the # wrapper hides it unless there is a problem. @@ -450,7 +450,7 @@ diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns echo "Running: \"$1\"" eval "$1" status=$? -@@ -194,10 +198,13 @@ checkit() { +@@ -222,10 +226,13 @@ checkit() { failed="YES"; fi @@ -468,16 +468,16 @@ diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns 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) +@@ -108,6 +108,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) #endif +static int display_atimes = 0; -+ ++ static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", -@@ -112,12 +114,29 @@ static void failed(char const *what, char const *where) +@@ -115,12 +117,29 @@ static void failed(char const *what, char const *where) exit(1); } @@ -509,7 +509,7 @@ diff --git a/tls.c b/tls.c char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -154,19 +173,11 @@ static void list_file(const char *fname) +@@ -159,19 +178,11 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -534,10 +534,10 @@ diff --git a/tls.c b/tls.c /* TODO: Perhaps escape special characters in fname? */ -@@ -177,13 +188,14 @@ static void list_file(const char *fname) +@@ -182,13 +193,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); + } 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, @@ -548,21 +548,21 @@ diff --git a/tls.c b/tls.c static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ + {"atimes", 'U', POPT_ARG_NONE, &display_atimes, 0, 0, 0}, + {"link-times", 'l', POPT_ARG_NONE, &link_times, 0, 0, 0 }, + {"link-owner", 'L', POPT_ARG_NONE, &link_owner, 0, 0, 0 }, #ifdef SUPPORT_XATTRS - {"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 }, - #endif -@@ -197,6 +209,7 @@ static void tls_usage(int ret) +@@ -204,6 +216,7 @@ static void tls_usage(int ret) fprintf(F,"usage: " PROGRAM " [OPTIONS] FILE ...\n"); fprintf(F,"Trivial file listing program for portably checking rsync\n"); fprintf(F,"\nOptions:\n"); + fprintf(F," -U, --atimes display access (last-used) times\n"); + fprintf(F," -l, --link-times display the time on a symlink\n"); + fprintf(F," -L, --link-owner display the owner+group on a symlink\n"); #ifdef SUPPORT_XATTRS - fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n"); - #endif 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) +@@ -123,7 +123,7 @@ NORETURN void overflow_exit(const char *str) exit_cleanup(RERR_MALLOC); } @@ -571,10 +571,10 @@ diff --git a/util.c b/util.c { #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(mode)) -@@ -130,9 +130,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, mode_t mode) #endif - if (verbose > 2) { + if (DEBUG_GTE(TIME, 1)) { - rprintf(FINFO, "set modtime of %s to (%ld) %s", + char mtimebuf[200]; + @@ -587,7 +587,7 @@ diff --git a/util.c b/util.c } if (dry_run) -@@ -141,7 +145,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -142,7 +146,7 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) { #ifdef HAVE_UTIMES struct timeval t[2]; @@ -596,7 +596,7 @@ diff --git a/util.c b/util.c t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -155,12 +159,12 @@ int set_modtime(const char *fname, time_t modtime, mode_t mode) +@@ -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;