X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/afcb578c53a1c5579d48336e2197e476cead7057..5214a41bbae94607b196b199b483710e1babf292:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 8327182..ed33c74 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,416 +1,269 @@ -After applying this patch, run these commands for a successful build: +To use this patch, run these commands for a successful build: - ./prepare-source + patch -p1 mode)) { -- rprintf(FINFO, "%s %11.0f %s %s -> %s\n", -+ rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n", - permbuf, - (double)f->length, timestring(f->modtime), -+ preserve_atimes ? timestring(f->atime) : "", - f_name(f, NULL), f->u.link); - } else + 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) + uid_ndx = ++file_extra_cnt; + if (preserve_gid) + gid_ndx = ++file_extra_cnt; ++ if (preserve_atimes) ++ atimes_ndx = (file_extra_cnt += TIME_EXTRA_CNT); + if (preserve_acls && !am_sender) + acls_ndx = ++file_extra_cnt; + if (preserve_xattrs) +diff --git a/flist.c b/flist.c +--- a/flist.c ++++ b/flist.c +@@ -54,6 +54,7 @@ extern int missing_args; + 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; +@@ -404,7 +405,7 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, #endif - { -- rprintf(FINFO, "%s %11.0f %s %s\n", -+ rprintf(FINFO, "%s %11.0f %s %s %s\n", - permbuf, - (double)f->length, timestring(f->modtime), -+ preserve_atimes ? timestring(f->atime) : "", - f_name(f, NULL)); - } - } -@@ -312,6 +321,7 @@ static void send_file_entry(struct file_ + int ndx, int first_ndx) { - unsigned short flags; - static time_t modtime; -+ static time_t atime; +- static time_t modtime; ++ static time_t modtime, atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; -@@ -327,7 +337,7 @@ static void send_file_entry(struct file_ - - if (!file) { - write_byte(f, 0); -- modtime = 0, mode = 0; -+ modtime = 0, atime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); - rdev_major = 0; - uid = 0, gid = 0; -@@ -339,7 +349,7 @@ static void send_file_entry(struct file_ - - f_name(file, fname); - -- flags = file->flags & XMIT_TOP_DIR; -+ flags = FFLAGS(file) & XMIT_TOP_DIR; - - if (file->mode == mode) - flags |= XMIT_SAME_MODE; -@@ -375,6 +385,12 @@ static void send_file_entry(struct file_ - flags |= XMIT_SAME_TIME; - else +@@ -504,6 +505,13 @@ static void send_file_entry(int f, const char *fname, struct file_struct *file, modtime = file->modtime; -+ if (preserve_atimes && !S_ISDIR(mode)) { -+ if (file->atime == atime) -+ flags |= XMIT_SAME_ATIME; + 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) ++ xflags |= XMIT_SAME_ATIME; + else -+ atime = file->atime; ++ atime = file_atime; + } #ifdef SUPPORT_HARD_LINKS - if (file->link_u.idev) { -@@ -428,6 +444,8 @@ static void send_file_entry(struct file_ - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) + if (tmp_dev != 0) { +@@ -590,6 +598,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 (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) -+ write_int(f, atime); - if (preserve_uid && !(flags & XMIT_SAME_UID)) { - if (!numeric_ids) - add_uid(uid); -@@ -496,6 +514,7 @@ static struct file_struct *receive_file_ - unsigned short flags, int f) ++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) ++ write_varlong(f, atime, 4); + if (preserve_uid && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) + write_int(f, uid); +@@ -675,7 +685,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 time_t modtime; -+ static time_t atime; +- static int64 modtime; ++ static int64 modtime, atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; -@@ -514,7 +533,7 @@ static struct file_struct *receive_file_ - struct file_struct *file; - - if (!flist) { -- modtime = 0, mode = 0; -+ modtime = 0, atime = 0, mode = 0; - dev = 0, rdev = makedev(0, 0); - rdev_major = 0; - uid = 0, gid = 0; -@@ -570,6 +589,8 @@ static struct file_struct *receive_file_ - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) +@@ -819,6 +829,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 (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) -+ atime = (time_t)read_int(f); ++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) { ++ atime = read_varlong(f, 4); ++#if SIZEOF_TIME_T < SIZEOF_INT64 ++ if (!am_generator && (int64)(time_t)atime != atime) { ++ rprintf(FERROR_XFER, ++ "Access time value of %s truncated on receiver.\n", ++ lastname); ++ } ++#endif ++ } - if (chmod_modes && !S_ISLNK(mode)) + if (chmod_modes && !S_ISLNK(mode) && mode) mode = tweak_mode(mode, chmod_modes); -@@ -625,6 +646,8 @@ static struct file_struct *receive_file_ - file->mode = mode; - file->uid = uid; - file->gid = gid; -+ if (preserve_atimes) -+ file->atime = atime; - - if (dirname_len) { - file->dirname = lastdir = bp; -@@ -650,12 +673,12 @@ static struct file_struct *receive_file_ - && lastname[del_hier_name_len-1] == '.' - && lastname[del_hier_name_len-2] == '/') - del_hier_name_len -= 2; -- file->flags |= FLAG_TOP_DIR | FLAG_DEL_HERE; -+ FFLAGS(file) |= FLAG_TOP_DIR | FLAG_DEL_HERE; - } else if (in_del_hier) { - if (!relative_paths || !del_hier_name_len - || (l1 >= del_hier_name_len - && lastname[del_hier_name_len] == '/')) -- file->flags |= FLAG_DEL_HERE; -+ FFLAGS(file) |= FLAG_DEL_HERE; - else - in_del_hier = 0; - } -@@ -871,12 +894,14 @@ struct file_struct *make_file(char *fnam - memset(bp, 0, file_struct_len); - bp += file_struct_len; - -- file->flags = flags; -+ FFLAGS(file) = flags; - file->modtime = st.st_mtime; - file->length = st.st_size; - file->mode = st.st_mode; - file->uid = st.st_uid; - file->gid = st.st_gid; -+ if (preserve_atimes) -+ file->atime = st.st_atime; - - #ifdef SUPPORT_HARD_LINKS - if (flist && flist->hlink_pool) { -@@ -989,7 +1014,7 @@ static void send_if_directory(int f, str - char is_dot_dir = fbuf[ol-1] == '.' && (ol == 1 || fbuf[ol-2] == '/'); - - if (S_ISDIR(file->mode) -- && !(file->flags & FLAG_MOUNT_POINT) && f_name(file, fbuf)) { -+ && !(FFLAGS(file) & FLAG_MOUNT_POINT) && f_name(file, fbuf)) { - void *save_filters; - unsigned int len = strlen(fbuf); - if (len > 1 && fbuf[len-1] == '/') -@@ -1595,8 +1620,9 @@ static void clean_flist(struct file_list - } - /* Make sure we don't lose track of a user-specified - * top directory. */ -- flist->files[keep]->flags |= flist->files[drop]->flags -- & (FLAG_TOP_DIR|FLAG_DEL_HERE); -+ FFLAGS(flist->files[keep]) -+ |= FFLAGS(flist->files[drop]) -+ & (FLAG_TOP_DIR|FLAG_DEL_HERE); - - clear_file(flist->files[drop], flist); - -@@ -1720,7 +1746,7 @@ static void output_flist(struct file_lis - file->dirname ? file->dirname : "", - file->dirname ? "/" : "", NS(file->basename), - S_ISDIR(file->mode) ? "/" : "", (int)file->mode, -- (double)file->length, uidbuf, gidbuf, file->flags); -+ (double)file->length, uidbuf, gidbuf, FFLAGS(file)); +@@ -979,6 +999,8 @@ static struct file_struct *recv_file_entry(int f, struct file_list *flist, int x + F_GROUP(file) = gid; + file->flags |= gid_flags; } - } - ---- old/generator.c -+++ new/generator.c -@@ -44,6 +44,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; -@@ -91,6 +92,7 @@ extern dev_t filesystem_dev; - extern char *backup_dir; - extern char *backup_suffix; - extern int backup_suffix_len; -+extern unsigned int file_struct_len; - extern struct file_list *the_file_list; - extern struct filter_list_struct server_filter_list; - -@@ -185,7 +187,7 @@ static int delete_item(char *fname, int - for (j = dirlist->count; j--; ) { - struct file_struct *fp = dirlist->files[j]; - -- if (fp->flags & FLAG_MOUNT_POINT) -+ if (FFLAGS(fp) & FLAG_MOUNT_POINT) - continue; - - strlcpy(p, fp->basename, remainder); -@@ -263,7 +265,7 @@ static void delete_in_dir(struct file_li - filt_array[cur_depth] = push_local_filters(fbuf, dlen); - - if (one_file_system) { -- if (file->flags & FLAG_TOP_DIR) -+ if (FFLAGS(file) & FLAG_TOP_DIR) - filesystem_dev = stp->st_dev; - else if (filesystem_dev != stp->st_dev) - return; -@@ -275,7 +277,7 @@ static void delete_in_dir(struct file_li - * from the filesystem. */ - for (i = dirlist->count; i--; ) { - struct file_struct *fp = dirlist->files[i]; -- if (!fp->basename || fp->flags & FLAG_MOUNT_POINT) -+ if (!fp->basename || FFLAGS(fp) & FLAG_MOUNT_POINT) - continue; - if (flist_find(flist, fp) < 0) { - f_name(fp, delbuf); -@@ -301,11 +303,11 @@ static void do_delete_pass(struct file_l - for (j = 0; j < flist->count; j++) { - struct file_struct *file = flist->files[j]; - -- if (!(file->flags & FLAG_DEL_HERE)) -+ if (!(FFLAGS(file) & FLAG_DEL_HERE)) - continue; - - f_name(file, fbuf); -- if (verbose > 1 && file->flags & FLAG_TOP_DIR) -+ if (verbose > 1 && FFLAGS(file) & FLAG_TOP_DIR) - rprintf(FINFO, "deleting in %s\n", fbuf); - - if (link_stat(fbuf, &st, keep_dirlinks) < 0 -@@ -349,6 +351,9 @@ void itemize(struct file_struct *file, i - && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) ++ if (atimes_ndx) ++ f_atime_set(file, (time_t)atime); + if (unsort_ndx) + F_NDX(file) = flist->used + flist->ndx_start; + +@@ -1374,6 +1396,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; ++ if (atimes_ndx) ++ f_atime_set(file, st.st_atime); + + if (basename != thisname) + file->dirname = lastdir; +diff --git a/generator.c b/generator.c +--- a/generator.c ++++ b/generator.c +@@ -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)) iflags |= ITEM_REPORT_TIME; -+ if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode) -+ && cmp_time(file->atime, 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; - if ((file->mode & CHMOD_BITS) != (st->st_mode & CHMOD_BITS)) - iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && file->uid != st->st_uid) -@@ -550,7 +555,7 @@ static int find_fuzzy(struct file_struct - uint32 dist; - - if (!S_ISREG(fp->mode) || !fp->length -- || fp->flags & FLAG_NO_FUZZY) -+ || FFLAGS(fp) & FLAG_NO_FUZZY) - continue; - - name = fp->basename; -@@ -659,6 +664,8 @@ static int try_dests_reg(struct file_str - itemizing && verbose > 1, - code) < 0) + #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, + if (link_dest) { + if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; -+ if (preserve_atimes) -+ set_file_attrs(fname, file, stp, 0); - if (preserve_hard_links && file->link_u.links) - hard_link_cluster(file, ndx, itemizing, code); - } else if (itemizing) -@@ -894,7 +901,7 @@ static void recv_generator(char *fname, - && verbose && code && f_out != -1) - rprintf(code, "%s/\n", fname); - if (delete_during && f_out != -1 && !phase && dry_run < 2 -- && (file->flags & FLAG_DEL_HERE)) -+ && (FFLAGS(file) & FLAG_DEL_HERE)) - delete_in_dir(the_file_list, fname, file, &st); - return; - } -@@ -1176,7 +1183,7 @@ static void recv_generator(char *fname, - if (fuzzy_basis) { - int j = flist_find(fuzzy_dirlist, file); - if (j >= 0) /* don't use changing file as future fuzzy basis */ -- fuzzy_dirlist->files[j]->flags |= FLAG_NO_FUZZY; -+ FFLAGS(fuzzy_dirlist->files[j]) |= FLAG_NO_FUZZY; - } ++ if (atimes_ndx) ++ 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 && (INFO_GTE(NAME, 2) || stdout_format_has_i > 1)) { +@@ -1017,6 +1022,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; + int64 len; + int colwidth = human_readable ? 14 : 11; - /* open the file */ ---- old/hlink.c -+++ new/hlink.c -@@ -26,6 +26,7 @@ extern int link_dest; - extern int make_backups; - extern int log_format_has_i; - extern char *basis_dir[]; -+extern unsigned int file_struct_len; - extern struct file_list *the_file_list; +@@ -1032,10 +1038,11 @@ static void list_file_entry(struct file_struct *f) - #ifdef SUPPORT_HARD_LINKS -@@ -86,10 +87,10 @@ static void link_idev_data(void) - FPTR(cur)->link_u.links = pool_talloc(hlink_pool, - struct hlink, 1, "hlink_list"); + #ifdef SUPPORT_LINKS + if (preserve_links && S_ISLNK(f->mode)) { +- 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)); + } else + #endif + if (missing_args == 2 && f->mode == 0) { +@@ -1043,9 +1050,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)); + } + } -- FPTR(head)->flags |= FLAG_HLINK_TOL; -+ FFLAGS(FPTR(head)) |= FLAG_HLINK_TOL; - FPTR(cur)->F_HLINDEX = to; - FPTR(cur)->F_NEXT = head; -- FPTR(cur)->flags |= FLAG_HLINK_EOL; -+ FFLAGS(FPTR(cur)) |= FLAG_HLINK_EOL; - hlink_list[to++] = head; - } else - FPTR(cur)->link_u.links = NULL; -@@ -175,7 +176,7 @@ int hard_link_check(struct file_struct * - { - #ifdef SUPPORT_HARD_LINKS - int head; -- if (skip && !(file->flags & FLAG_HLINK_EOL)) -+ if (skip && !(FFLAGS(file) & FLAG_HLINK_EOL)) - head = hlink_list[file->F_HLINDEX] = file->F_NEXT; - else - head = hlink_list[file->F_HLINDEX]; -@@ -270,8 +271,8 @@ void hard_link_cluster(struct file_struc - file->F_HLINDEX = FINISHED_LINK; - if (link_stat(f_name(file, hlink1), &st1, 0) < 0) - return; -- if (!(file->flags & FLAG_HLINK_TOL)) { -- while (!(file->flags & FLAG_HLINK_EOL)) { -+ if (!(FFLAGS(file) & FLAG_HLINK_TOL)) { -+ while (!(FFLAGS(file) & FLAG_HLINK_EOL)) { - ndx = file->F_NEXT; - file = FPTR(ndx); +@@ -1925,7 +1934,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, F_MOD_NSEC(file), file->mode); ++ set_times(fname, file->modtime, F_MOD_NSEC(file), file->modtime, file->mode); } -@@ -286,6 +287,6 @@ void hard_link_cluster(struct file_struc - maybe_hard_link(file, ndx, hlink2, statret, &st2, - hlink1, &st1, itemizing, code); - file->F_HLINDEX = FINISHED_LINK; -- } while (!(file->flags & FLAG_HLINK_EOL)); -+ } while (!(FFLAGS(file) & FLAG_HLINK_EOL)); - #endif + if (counter >= loopchk_limit) { + if (allowed_lull) +diff --git a/ifuncs.h b/ifuncs.h +--- a/ifuncs.h ++++ b/ifuncs.h +@@ -43,6 +43,28 @@ free_xbuf(xbuf *xb) + memset(xb, 0, sizeof (xbuf)); } ---- old/log.c -+++ new/log.c -@@ -42,6 +42,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 log_format_has_i; - extern int log_format_has_o_or_i; - extern int daemon_log_format_has_o_or_i; -@@ -605,10 +606,12 @@ static void log_formatted(enum logcode c - n[3] = !(iflags & ITEM_REPORT_SIZE) ? '.' : 's'; - n[4] = !(iflags & ITEM_REPORT_TIME) ? '.' - : !preserve_times || S_ISLNK(file->mode) ? 'T' : 't'; -- n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; -- n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; -- n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; -- n[8] = '\0'; -+ n[5] = !(iflags & ITEM_REPORT_ATIME) ? '.' -+ : S_ISLNK(file->mode) ? 'U' : 'u'; -+ n[6] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; -+ n[7] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; -+ n[8] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; -+ n[9] = '\0'; - if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { - char ch = iflags & ITEM_IS_NEW ? '+' : '?'; ---- old/options.c -+++ new/options.c -@@ -52,6 +52,7 @@ int preserve_uid = 0; ++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 + to_wire_mode(mode_t mode) + { +diff --git a/log.c b/log.c +--- a/log.c ++++ b/log.c +@@ -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'; +- c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' : 'u'; ++ c[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' ++ : S_ISLNK(file->mode) ? 'U' : 'u'; + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a'; + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; + c[11] = '\0'; +diff --git a/options.c b/options.c +--- a/options.c ++++ b/options.c +@@ -59,6 +59,7 @@ int preserve_specials = 0; + int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; - int omit_dir_times = 0; +int preserve_atimes = 0; int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -300,8 +301,9 @@ void usage(enum logcode F) - rprintf(F," --devices preserve device files (super-user only)\n"); - rprintf(F," --specials preserve special files\n"); +@@ -699,6 +700,7 @@ void usage(enum logcode F) rprintf(F," -D same as --devices --specials\n"); -- rprintf(F," -t, --times preserve times\n"); -- rprintf(F," -O, --omit-dir-times omit directories when preserving times\n"); -+ rprintf(F," -t, --times preserve modify times\n"); -+ rprintf(F," -O, --omit-dir-times omit directories when preserving modify times\n"); -+ rprintf(F," -U, --atimes preserve access (use) times\n"); + rprintf(F," -t, --times preserve modification times\n"); + rprintf(F," -O, --omit-dir-times omit directories from --times\n"); ++ rprintf(F," -U, --atimes preserve access (last-used) times\n"); rprintf(F," --super receiver attempts super-user activities\n"); - rprintf(F," -S, --sparse handle sparse files efficiently\n"); - rprintf(F," -n, --dry-run show what would have been transferred\n"); -@@ -414,6 +416,9 @@ static struct poptOption long_options[] - {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, + #ifdef SUPPORT_XATTRS + rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); +@@ -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 }, + {"atimes", 'U', POPT_ARG_VAL, &preserve_atimes, 1, 0, 0 }, + {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 }, -+ {"no-k", 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 }, -@@ -1507,6 +1512,8 @@ void server_options(char **args,int *arg ++ {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 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 }, +@@ -2326,6 +2331,8 @@ void server_options(char **args, int *argc_p) argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -419,72 +272,90 @@ After applying this patch, run these commands for a successful build: if (preserve_perms) argstr[x++] = 'p'; else if (preserve_executability && am_sender) ---- old/rsync.c -+++ new/rsync.c -@@ -37,6 +37,7 @@ extern int preserve_perms; - extern int preserve_executability; - extern int preserve_times; - extern int omit_dir_times; -+extern int preserve_atimes; - extern int orig_umask; - extern int am_root; - extern int am_server; -@@ -125,6 +126,7 @@ int set_file_attrs(char *fname, struct f +diff --git a/rsync.c b/rsync.c +--- a/rsync.c ++++ b/rsync.c +@@ -451,6 +451,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp, int updated = 0; - STRUCT_STAT st2; + stat_x sx2; int change_uid, change_gid; + time_t atime, mtime; + mode_t new_mode = file->mode; + int inherit; - if (!st) { - if (dry_run) -@@ -143,18 +145,33 @@ int set_file_attrs(char *fname, struct f - } - } +@@ -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 + /* This code must be the first update in the function due to + * how it uses the "updated" variable. */ - if (!preserve_times || (S_ISDIR(st->st_mode) && omit_dir_times)) + if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && preserve_times == 1)) flags |= ATTRS_SKIP_MTIME; -+ if (!preserve_atimes || S_ISDIR(st->st_mode)) ++ if (!atimes_ndx || S_ISDIR(sxp->st.st_mode)) + flags |= ATTRS_SKIP_ATIME; if (!(flags & ATTRS_SKIP_MTIME) - && cmp_time(st->st_mtime, file->modtime) != 0) { -- int ret = set_modtime(fname, file->modtime, st->st_mode); + && cmp_time(sxp->st.st_mtime, file->modtime) != 0) { +- int ret = set_modtime(fname, file->modtime, F_MOD_NSEC(file), sxp->st.st_mode); + mtime = file->modtime; + updated = 1; + } else -+ mtime = st->st_mtime; -+ if (!(flags & ATTRS_SKIP_ATIME) -+ && cmp_time(st->st_atime, file->atime) != 0) { -+ atime = file->atime; -+ updated = 1; ++ mtime = sxp->st.st_mtime; ++ if (!(flags & ATTRS_SKIP_ATIME)) { ++ time_t file_atime = f_atime(file); ++ if (cmp_time(sxp->st.st_atime, file_atime) != 0) { ++ atime = file_atime; ++ updated = 1; ++ } else ++ atime = sxp->st.st_atime; + } else -+ atime = st->st_atime; ++ atime = sxp->st.st_atime; + if (updated) { -+ int ret = set_times(fname, mtime, atime, st->st_mode); ++ int ret = set_times(fname, mtime, F_MOD_NSEC(file), 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)); - return 0; + goto cleanup; } - if (ret == 0) /* ret == 1 if symlink could not be set */ - updated = 1; -+ if (ret > 0) /* ret == 1 if symlink could not be set */ +- else ++ if (ret > 0) { /* ret == 1 if symlink could not be set */ + updated = 0; + file->flags |= FLAG_TIME_FAILED; ++ } } - change_uid = am_root && preserve_uid && st->st_uid != file->uid; ---- old/rsync.h -+++ new/rsync.h -@@ -54,6 +54,7 @@ - #define XMIT_HAS_IDEV_DATA (1<<9) - #define XMIT_SAME_DEV (1<<10) - #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) -+#define XMIT_SAME_ATIME (1<<12) + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); +@@ -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, +- 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 (DEBUG_GTE(RECV, 1)) +@@ -666,7 +685,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 +@@ -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_MOD_NSEC (1<<13) /* protocols 31 - now */ ++#define XMIT_SAME_ATIME (1<<14) /* protocols ?? - now */ /* These flags are used in the live flist data. */ -@@ -119,6 +120,7 @@ +@@ -160,6 +161,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -492,43 +363,33 @@ After applying this patch, run these commands for a successful build: #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -135,6 +137,7 @@ - #define FNAMECMP_FUZZY 0x83 - - /* For use by the itemize_changes code */ -+#define ITEM_REPORT_ATIME (1<<0) - #define ITEM_REPORT_CHECKSUM (1<<1) - #define ITEM_REPORT_SIZE (1<<2) - #define ITEM_REPORT_TIME (1<<3) -@@ -520,9 +523,12 @@ struct file_struct { - uid_t uid; - gid_t gid; - mode_t mode; -- uchar flags; /* this item MUST remain last */ -+ time_t atime; /* this MUST be second to last */ -+ uchar fl4g5; /* this item MUST remain last */ - }; - -+#define FFLAGS(f) ((uchar*)(f))[file_struct_len-1] -+ - /* - * Start the flist array at FLIST_START entries and grow it - * by doubling until FLIST_LINEAR then grow by FLIST_LINEAR ---- old/rsync.yo -+++ new/rsync.yo -@@ -323,8 +323,9 @@ to the detailed description below for a - --devices preserve device files (super-user only) - --specials preserve special files +@@ -664,12 +666,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; + + #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 +@@ -356,6 +356,7 @@ to the detailed description below for a complete description. verb( -D same as --devices --specials -- -t, --times preserve times -- -O, --omit-dir-times omit directories when preserving times -+ -t, --times preserve modify times -+ -O, --omit-dir-times omit directories when preserving mod-times + -t, --times preserve modification times + -O, --omit-dir-times omit directories from --times + -U, --atimes preserve access (use) times --super receiver attempts super-user activities + --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently - -n, --dry-run show what would have been transferred -@@ -801,6 +802,12 @@ it is preserving modification times (see +@@ -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). @@ -541,375 +402,59 @@ After applying this patch, run these commands for a successful build: 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 -@@ -1308,8 +1315,8 @@ if the receiving rsync is at least versi - with older versions of rsync, but that also turns on the output of other - verbose messages). - --The "%i" escape has a cryptic output that is 8 letters long. The general --format is like the string bf(YXcstpog), where bf(Y) is replaced by the -+The "%i" escape has a cryptic output that is 9 letters long. The general -+format is like the string bf(YXcstupog), where bf(Y) is replaced by the - kind of update being done, bf(X) is replaced by the file-type, and the - other letters represent attributes that may be output if they are being - modified. -@@ -1349,9 +1356,13 @@ quote(itemize( - 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). +@@ -1931,7 +1938,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 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 -+ anytime a symlink is transferred. - it() A bf(p) means the permissions are different and are being updated to - the sender's value (requires bf(--perms)). - it() An bf(o) means the owner is different and is being updated to the ---- old/sender.c -+++ new/sender.c -@@ -38,6 +38,7 @@ extern int do_progress; - extern int inplace; - extern int batch_fd; - extern int write_batch; -+extern unsigned int file_struct_len; - extern struct stats stats; - extern struct file_list *the_file_list; - extern char *log_format; -@@ -126,7 +127,7 @@ void successful_send(int ndx) - - file = the_file_list->files[ndx]; - /* The generator might tell us about symlinks we didn't send. */ -- if (!(file->flags & FLAG_SENT) && !S_ISLNK(file->mode)) -+ if (!(FFLAGS(file) & FLAG_SENT) && !S_ISLNK(file->mode)) - return; - if (file->dir.root) { - offset = stringjoin(fname, sizeof fname, -@@ -370,7 +371,7 @@ void send_files(struct file_list *flist, - rprintf(FINFO, "sender finished %s\n", fname); - - /* Flag that we actually sent this entry. */ -- file->flags |= FLAG_SENT; -+ FFLAGS(file) |= FLAG_SENT; - } - make_backups = save_make_backups; - ---- old/testsuite/atimes.test -+++ new/testsuite/atimes.test -@@ -0,0 +1,19 @@ ++ when a symlink or directory is updated. + it() The bf(a) means that the ACL information changed. + 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 ++++ b/testsuite/atimes.test +@@ -0,0 +1,17 @@ +#! /bin/sh + +# Test rsync copying atimes + +. "$suitedir/rsync.fns" + -+set -x -+ +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 ---- old/testsuite/devices.test -+++ new/testsuite/devices.test -@@ -42,14 +42,14 @@ touch -r "$fromdir/block" "$fromdir/bloc - $RSYNC -ai "$fromdir/block" "$todir/block2" \ - | tee "$outfile" - cat <"$chkfile" --cD++++++ block -+cD+++++++ block - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" - - $RSYNC -ai "$fromdir/block2" "$todir/block" \ - | tee "$outfile" - cat <"$chkfile" --cD++++++ block2 -+cD+++++++ block2 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" - -@@ -58,7 +58,7 @@ sleep 1 - $RSYNC -Di "$fromdir/block3" "$todir/block" \ - | tee "$outfile" - cat <"$chkfile" --cD..T... block3 -+cD..T.... block3 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" - -@@ -66,15 +66,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d..t... ./ --cD..t... block --cD...... block2 --cD++++++ block3 --hD++++++ block2.5 => block3 --cD++++++ char --cD++++++ char2 --cD++++++ char3 --cS++++++ fifo -+.d..t.... ./ -+cD..t.... block -+cD....... block2 -+cD+++++++ block3 -+hD+++++++ block2.5 => block3 -+cD+++++++ char -+cD+++++++ char2 -+cD+++++++ char3 -+cS+++++++ fifo - EOT - if test ! -b "$fromdir/block2.5"; then - sed -e '/block2\.5/d' \ ---- old/testsuite/itemize.test -+++ new/testsuite/itemize.test -@@ -29,14 +29,14 @@ ln "$fromdir/foo/config1" "$fromdir/foo/ - $RSYNC -iplr "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --cd++++++ bar/ --cd++++++ bar/baz/ -->f++++++ bar/baz/rsync --cd++++++ foo/ -->f++++++ foo/config1 -->f++++++ foo/config2 -->f++++++ foo/extra --cL++++++ foo/sym -> ../bar/baz/rsync -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+>f+++++++ bar/baz/rsync -+cd+++++++ foo/ -+>f+++++++ foo/config1 -+>f+++++++ foo/config2 -+>f+++++++ foo/extra -+cL+++++++ foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" - -@@ -48,10 +48,10 @@ chmod 601 "$fromdir/foo/config2" - $RSYNC -iplrH "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" -->f..T... bar/baz/rsync -->f..T... foo/config1 -->f.sTp.. foo/config2 --hf..T... foo/extra => foo/config1 -+>f..T.... bar/baz/rsync -+>f..T.... foo/config1 -+>f.sT.p.. foo/config2 -+hf..T.... foo/extra => foo/config1 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" - -@@ -68,11 +68,11 @@ chmod 777 "$todir/bar/baz/rsync" - $RSYNC -iplrtc "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.f..tp.. bar/baz/rsync --.d..t... foo/ --.f..t... foo/config1 -->fcstp.. foo/config2 --cL..T... foo/sym -> ../bar/baz/rsync -+.f..t.p.. bar/baz/rsync -+.d..t.... foo/ -+.f..t.... foo/config1 -+>fcst.p.. foo/config2 -+cL..T.... foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" - -@@ -97,15 +97,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d ./ --.d bar/ --.d bar/baz/ --.f...p.. bar/baz/rsync --.d foo/ --.f foo/config1 -->f..t... foo/config2 --hf foo/extra --.L foo/sym -> ../bar/baz/rsync -+.d ./ -+.d bar/ -+.d bar/baz/ -+.f....p.. bar/baz/rsync -+.d foo/ -+.f foo/config1 -+>f..t.... foo/config2 -+hf foo/extra -+.L foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed" - -@@ -124,8 +124,8 @@ touch "$todir/foo/config2" - $RSYNC -iplrtH "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.f...p.. foo/config1 -->f..t... foo/config2 -+.f....p.. foo/config1 -+>f..t.... foo/config2 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed" - -@@ -134,15 +134,15 @@ $RSYNC -ivvplrtH --copy-dest="$lddir" "$ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cf bar/baz/rsync --cd++++++ foo/ --cf foo/config1 --cf foo/config2 --hf foo/extra => foo/config1 --cL..T... foo/sym -> ../bar/baz/rsync -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cf bar/baz/rsync -+cd+++++++ foo/ -+cf foo/config1 -+cf foo/config2 -+hf foo/extra => foo/config1 -+cL..T.... foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed" - -@@ -150,11 +150,11 @@ rm -rf "$todir" - $RSYNC -iplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cd++++++ foo/ --hf foo/extra => foo/config1 -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cd+++++++ foo/ -+hf foo/extra => foo/config1 - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed" - -@@ -181,15 +181,15 @@ $RSYNC -ivvplrtH --link-dest="$lddir" "$ - | tee "$outfile" - filter_outfile - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --hf bar/baz/rsync --cd++++++ foo/ --hf foo/config1 --hf foo/config2 --hf foo/extra => foo/config1 --hL foo/sym -> ../bar/baz/rsync -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+hf bar/baz/rsync -+cd+++++++ foo/ -+hf foo/config1 -+hf foo/config2 -+hf foo/extra => foo/config1 -+hL foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed" - -@@ -197,10 +197,10 @@ rm -rf "$todir" - $RSYNC -iplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cd++++++ foo/ -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cd+++++++ foo/ - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed" - -@@ -228,14 +228,14 @@ filter_outfile - # TODO fix really-old problem when combining -H with --compare-dest: - # missing output for foo/extra hard-link (and it might not be updated)! - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --.f bar/baz/rsync --cd++++++ foo/ --.f foo/config1 --.f foo/config2 --.L foo/sym -> ../bar/baz/rsync -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+.f bar/baz/rsync -+cd+++++++ foo/ -+.f foo/config1 -+.f foo/config2 -+.L foo/sym -> ../bar/baz/rsync - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed" - -@@ -243,10 +243,10 @@ rm -rf "$todir" - $RSYNC -iplrtH --compare-dest="$lddir" "$fromdir/" "$todir/" \ - | tee "$outfile" - cat <"$chkfile" --.d..t... ./ --cd++++++ bar/ --cd++++++ bar/baz/ --cd++++++ foo/ -+.d..t.... ./ -+cd+++++++ bar/ -+cd+++++++ bar/baz/ -+cd+++++++ foo/ - EOT - diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" - ---- old/testsuite/rsync.fns -+++ new/testsuite/rsync.fns -@@ -66,7 +66,7 @@ printmsg() { - } - - rsync_ls_lR() { -- find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" -+ find "$@" -print | sort | sed 's/ /\\ /g' | xargs "$TOOLDIR/tls" $TLS_ARGS - } - - check_perms() { -@@ -184,6 +184,10 @@ checkit() { +diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns +--- a/testsuite/rsync.fns ++++ b/testsuite/rsync.fns +@@ -214,6 +214,10 @@ checkit() { # 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=$? -@@ -191,10 +195,13 @@ checkit() { +@@ -221,10 +225,13 @@ checkit() { 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 + @@ -920,45 +465,47 @@ After applying this patch, run these commands for a successful build: ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to" diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES ---- old/tls.c -+++ new/tls.c -@@ -39,6 +39,7 @@ - - - #include "rsync.h" -+#include "popt.h" - - #define PROGRAM "tls" - -@@ -48,6 +49,7 @@ int read_only = 1; - int list_only = 0; - int preserve_perms = 0; +diff --git a/tls.c b/tls.c +--- a/tls.c ++++ b/tls.c +@@ -118,6 +118,8 @@ static int stat_xattr(const char *fname, STRUCT_STAT *fst) -+static int display_atime = 0; + #endif ++static int display_atimes = 0; ++ static void failed(char const *what, char const *where) { -@@ -56,14 +58,29 @@ static void failed(char const *what, cha + fprintf(stderr, PROGRAM ": %s %s: %s\n", +@@ -125,12 +127,37 @@ static void failed(char const *what, char const *where) exit(1); } -+static void storetime(char *dest, time_t t) ++static void storetime(char *dest, size_t destsize, time_t t, int nsecs) +{ + if (t) { ++ int len; + struct tm *mt = gmtime(&t); - -+ sprintf(dest, "%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); ++ if (nsecs >= 0) { ++ snprintf(datebuf + len, sizeof datebuf - len, ".%09d", nsecs); ++ } + } else { -+ strcpy(dest, " "); ++ 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) { STRUCT_STAT buf; @@ -970,108 +517,87 @@ After applying this patch, run these commands for a successful build: char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -96,19 +113,8 @@ 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); - -- sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d", +- len = snprintf(datebuf, sizeof datebuf, +- "%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); + #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 { -- strcpy(datebuf, " "); +- int len = MIN(19 + 9*nsec_times, (int)sizeof datebuf - 1); +- memset(datebuf, ' ', len); +- datebuf[len] = '\0'; - } -+ storetime(mtimebuf, buf.st_mtime); -+ storetime(atimebuf, buf.st_atime); ++ nsecs = -1; ++ storetime(mtimebuf, sizeof mtimebuf, buf.st_mtime, nsecs); ++ if (display_atimes) ++ 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? */ -@@ -119,24 +125,55 @@ static void list_file(const char *fname) +@@ -202,13 +216,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, - 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 */ -+ {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0}, -+ {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0}, -+ {0,0,0,0,0,0,0} -+}; -+ -+static void tls_usage(int ret) -+{ -+ fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n" -+ "Trivial file listing program for portably checking rsync\n"); -+ exit(ret); -+} - - int - main(int argc, char *argv[]) - { -- if (argc < 2) { -- fprintf(stderr, "usage: " PROGRAM " DIR ...\n" -- "Trivial file listing program for portably checking rsync\n"); -- return 1; -+ poptContext pc; -+ const char **extra_args; -+ int opt; -+ -+ pc = poptGetContext(PROGRAM, argc, (const char **)argv, -+ long_options, 0); -+ while ((opt = poptGetNextOpt(pc)) != -1) { -+ switch (opt) { -+ case 'h': -+ tls_usage(0); -+ default: -+ fprintf(stderr, -+ "%s: %s\n", -+ poptBadOption(pc, POPT_BADOPTION_NOALIAS), -+ poptStrerror(opt)); -+ tls_usage(1); -+ } - } - -- for (argv++; *argv; argv++) { -- list_file(*argv); -- } -+ extra_args = poptGetArgs(pc); -+ if (*extra_args == NULL) -+ tls_usage(1); -+ -+ for (; *extra_args; extra_args++) -+ list_file(*extra_args); -+ poptFreeContext(pc); - - return 0; - } ---- old/util.c -+++ new/util.c -@@ -125,7 +125,7 @@ void overflow_exit(char *str) + 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 +@@ -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"); ++ 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 +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); } --int set_modtime(char *fname, time_t modtime, mode_t mode) -+int set_times(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)) -@@ -133,9 +133,13 @@ int set_modtime(char *fname, time_t modt +@@ -131,9 +131,13 @@ int set_modtime(const char *fname, time_t modtime, uint32 mod_nsec, mode_t mode) #endif - if (verbose > 2) { + if (DEBUG_GTE(TIME, 1)) { - rprintf(FINFO, "set modtime of %s to (%ld) %s", + char mtimebuf[200]; + @@ -1084,18 +610,29 @@ After applying this patch, run these commands for a successful build: } if (dry_run) -@@ -144,7 +148,7 @@ int set_modtime(char *fname, time_t modt +@@ -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; -@@ -155,12 +159,12 @@ int set_modtime(char *fname, time_t modt - return utimes(fname, t); - #elif defined HAVE_UTIMBUF + 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); + tbuf.actime = atime;