X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/195ca26e0b49d761dda367bea5c7b09829bd7128..6e9495c76ccda5a38bb1fa68b19ff22e8c7a30ad:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 3e369ce..29a54be 100644 --- a/atimes.diff +++ b/atimes.diff @@ -1,409 +1,231 @@ -After applying this patch, run these commands for a successful build: +To use this patch, run these commands for a successful build: + 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 - #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)); - } - } -@@ -298,6 +307,7 @@ static void send_file_entry(struct file_ +@@ -125,6 +126,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; + if (preserve_acls && !am_sender) + acls_ndx = ++file_extra_cnt; + if (preserve_xattrs) +--- old/flist.c ++++ new/flist.c +@@ -53,6 +53,7 @@ extern int preserve_specials; + extern int uid_ndx; + extern int gid_ndx; + extern int eol_nulls; ++extern int atimes_ndx; + extern int relative_paths; + extern int implied_dirs; + extern int file_extra_cnt; +@@ -334,6 +335,7 @@ int push_pathname(const char *dir, int l + static void send_file_entry(int f, struct file_struct *file, int ndx, int first_ndx) { - unsigned short flags; static time_t modtime; + static time_t atime; static mode_t mode; + #ifdef SUPPORT_HARD_LINKS static int64 dev; - static dev_t rdev; -@@ -313,7 +323,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; -@@ -323,7 +333,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; -@@ -359,6 +369,12 @@ static void send_file_entry(struct file_ - flags |= XMIT_SAME_TIME; +@@ -440,6 +442,13 @@ static void send_file_entry(int f, struc + xflags |= XMIT_SAME_TIME; else modtime = file->modtime; -+ if (preserve_atimes && !S_ISDIR(mode)) { -+ if (file->atime == atime) -+ flags |= XMIT_SAME_ATIME; ++ 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) { -@@ -412,6 +428,8 @@ static void send_file_entry(struct file_ - write_int(f, modtime); - if (!(flags & XMIT_SAME_MODE)) + if (tmp_dev != 0) { +@@ -513,6 +522,8 @@ static void send_file_entry(int f, struc + } + 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); -@@ -478,6 +496,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 (uid_ndx && !(xflags & XMIT_SAME_UID)) { + if (protocol_version < 30) + write_int(f, uid); +@@ -599,7 +610,7 @@ static void send_file_entry(int f, struc + static struct file_struct *recv_file_entry(struct file_list *flist, + int xflags, int f) { - 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; -@@ -496,7 +515,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; -@@ -552,6 +571,8 @@ static struct file_struct *receive_file_ - modtime = (time_t)read_int(f); - if (!(flags & XMIT_SAME_MODE)) +@@ -732,6 +743,16 @@ static struct file_struct *recv_file_ent + } + 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 ((atime > INT_MAX || atime < INT_MIN) && !am_generator) { ++ rprintf(FERROR, ++ "Access time value of %s truncated on receiver.\n", ++ lastname); ++ } ++#endif ++ } if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -607,6 +628,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; -@@ -632,12 +655,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; - } -@@ -853,12 +876,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) { -@@ -971,7 +996,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] == '/') -@@ -1583,8 +1608,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); - -@@ -1708,7 +1734,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)); +@@ -860,6 +881,8 @@ static struct file_struct *recv_file_ent + F_GROUP(file) = gid; + file->flags |= gid_flags; } - } - ++ if (atimes_ndx) ++ F_ATIME(file) = (time_t)atime; + #ifdef ICONV_OPTION + if (ic_ndx) + F_NDX(file) = flist->used + flist->ndx_start; +@@ -1186,6 +1209,8 @@ struct file_struct *make_file(const char + F_OWNER(file) = st.st_uid; + if (gid_ndx) + F_GROUP(file) = st.st_gid; ++ if (atimes_ndx) ++ F_ATIME(file) = st.st_atime; + + if (basename != thisname) + file->dirname = lastdir; --- old/generator.c +++ new/generator.c -@@ -43,6 +43,7 @@ extern int preserve_perms; - extern int preserve_uid; - extern int preserve_gid; +@@ -43,6 +43,7 @@ extern int preserve_specials; + extern int preserve_hard_links; + extern int preserve_perms; extern int preserve_times; +extern int preserve_atimes; - extern int omit_dir_times; + extern int uid_ndx; + extern int gid_ndx; extern int delete_mode; - extern int delete_before; -@@ -89,6 +90,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; - -@@ -181,7 +183,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); -@@ -259,7 +261,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; -@@ -271,7 +273,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); -@@ -297,11 +299,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 -@@ -345,6 +347,9 @@ void itemize(struct file_struct *file, i - && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) - || (keep_time && cmp_time(file->modtime, st->st_mtime) != 0)) +@@ -562,6 +563,9 @@ void itemize(const char *fnamecmp, struc + && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) + || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0)) iflags |= ITEM_REPORT_TIME; + if (preserve_atimes && !S_ISDIR(file->mode) && !S_ISLNK(file->mode) -+ && cmp_time(file->atime, st->st_atime) != 0) ++ && 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) -@@ -548,7 +553,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; -@@ -664,6 +669,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)) { + ; +@@ -884,6 +888,8 @@ static int try_dests_reg(struct file_str + 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 -@@ -941,7 +948,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; - } -@@ -1244,7 +1251,7 @@ static void recv_generator(char *fname, - if (fuzzy_dirlist) { - 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; - } ++ 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 (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { +@@ -1080,6 +1086,7 @@ static int try_dests_non(struct file_str + static void list_file_entry(struct file_struct *f) + { + char permbuf[PERMSTRING_SIZE]; ++ time_t atime = atimes_ndx ? F_ATIME(f) : 0; + double len; - /* open the file */ ---- old/hlink.c -+++ new/hlink.c -@@ -30,6 +30,7 @@ extern int make_backups; - extern int remove_source_files; - extern int stdout_format_has_i; - extern char *basis_dir[]; -+extern unsigned int file_struct_len; - extern struct file_list *the_file_list; + if (!F_IS_ACTIVE(f)) { +@@ -1094,14 +1101,16 @@ static void list_file_entry(struct file_ - #ifdef SUPPORT_HARD_LINKS -@@ -90,10 +91,10 @@ static void link_idev_data(void) - FPTR(cur)->link_u.links = pool_talloc(hlink_pool, - struct hlink, 1, "hlink_list"); - -- 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; -@@ -179,7 +180,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]; -@@ -279,8 +280,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); - } -@@ -300,6 +301,6 @@ void hard_link_cluster(struct file_struc - send_msg(MSG_SUCCESS, numbuf, 4); - } - file->F_HLINDEX = FINISHED_LINK; -- } while (!(file->flags & FLAG_HLINK_EOL)); -+ } while (!(FFLAGS(file) & FLAG_HLINK_EOL)); + #ifdef SUPPORT_LINKS + if (preserve_links && S_ISLNK(f->mode)) { +- rprintf(FINFO, "%s %11.0f %s %s -> %s\n", ++ rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n", + permbuf, len, timestring(f->modtime), ++ atimes_ndx ? timestring(atime) : "", + f_name(f, NULL), F_SYMLINK(f)); + } else #endif + { +- rprintf(FINFO, "%s %11.0f %s %s\n", ++ rprintf(FINFO, "%s %11.0f %s %s %s\n", + permbuf, len, timestring(f->modtime), ++ atimes_ndx ? timestring(atime) : "", + f_name(f, NULL)); + } } +@@ -1851,7 +1860,7 @@ static void touch_up_dirs(struct file_li + 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)) --- old/log.c +++ new/log.c -@@ -37,6 +37,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 stdout_format_has_i; - extern int stdout_format_has_o_or_i; - extern int logfile_format_has_i; -@@ -609,7 +610,8 @@ static void log_formatted(enum logcode c - n[5] = !(iflags & ITEM_REPORT_PERMS) ? '.' : 'p'; - n[6] = !(iflags & ITEM_REPORT_OWNER) ? '.' : 'o'; - n[7] = !(iflags & ITEM_REPORT_GROUP) ? '.' : 'g'; -- n[8] = '.'; -+ n[8] = !(iflags & ITEM_REPORT_ATIME) ? '.' +@@ -631,7 +631,8 @@ static void log_formatted(enum logcode c + 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'; - n[9] = '\0'; - - if (iflags & (ITEM_IS_NEW|ITEM_MISSING_DATA)) { + c[9] = !(iflags & ITEM_REPORT_ACL) ? '.' : 'a'; + c[10] = !(iflags & ITEM_REPORT_XATTR) ? '.' : 'x'; + c[11] = '\0'; --- old/options.c +++ new/options.c -@@ -55,6 +55,7 @@ int preserve_uid = 0; +@@ -57,6 +57,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; -@@ -309,8 +310,9 @@ void usage(enum logcode F) - rprintf(F," --devices preserve device files (super-user only)\n"); - rprintf(F," --specials preserve special files\n"); +@@ -346,6 +347,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"); -@@ -424,6 +426,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"); +@@ -480,6 +482,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 }, -@@ -1537,6 +1542,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 }, +@@ -1713,6 +1718,8 @@ void server_options(char **args, int *ar argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -414,51 +236,54 @@ After applying this patch, run these commands for a successful build: else if (preserve_executability && am_sender) --- old/rsync.c +++ new/rsync.c -@@ -34,6 +34,7 @@ extern int verbose; - extern int dry_run; +@@ -33,6 +33,7 @@ extern int preserve_acls; + extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; +extern int preserve_atimes; extern int preserve_times; - extern int omit_dir_times; extern int am_root; -@@ -127,6 +128,7 @@ int set_file_attrs(char *fname, struct f + extern int am_server; +@@ -340,6 +341,7 @@ int set_file_attrs(const char *fname, st 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) -@@ -145,18 +147,33 @@ int set_file_attrs(char *fname, struct f - } - } +@@ -380,18 +382,36 @@ int set_file_attrs(const char *fname, st + set_stat_xattr(fname, file); + #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 (!preserve_atimes || 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, 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, atime, sxp->st.st_mode); if (ret < 0) { rsyserr(FERROR, 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; @@ -466,18 +291,18 @@ After applying this patch, run these commands for a successful build: + updated = 0; } - change_uid = am_root && preserve_uid && st->st_uid != file->uid; + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); --- 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) +@@ -57,6 +57,7 @@ + #define XMIT_RDEV_MINOR_8_pre30 (1<<11) /* protocols 28 - 29 */ + #define XMIT_GROUP_NAME_FOLLOWS (1<<11) /* protocols 30 - now */ + #define XMIT_HLINK_FIRST (1<<12) /* protocols 30 - now (HLINKED files only) */ ++#define XMIT_SAME_ATIME (1<<13) /* protocols ?? - now */ /* These flags are used in the live flist data. */ -@@ -120,6 +121,7 @@ +@@ -145,6 +146,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -485,35 +310,33 @@ After applying this patch, run these commands for a successful build: #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -523,9 +525,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 +@@ -602,6 +604,7 @@ 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; + +@@ -639,6 +642,7 @@ extern int xattrs_ndx; + /* When the associated option is on, all entries will have these present: */ + #define F_OWNER(f) REQ_EXTRA(f, uid_ndx)->unum + #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum ++#define F_ATIME(f) REQ_EXTRA(f, atimes_ndx)->unum + #define F_ACL(f) REQ_EXTRA(f, acls_ndx)->num + #define F_XATTR(f) REQ_EXTRA(f, xattrs_ndx)->num + #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num --- old/rsync.yo +++ new/rsync.yo -@@ -327,8 +327,9 @@ to the detailed description below for a - --devices preserve device files (super-user only) - --specials preserve special files +@@ -349,6 +349,7 @@ to the detailed description below for a -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 -@@ -862,6 +863,12 @@ it is preserving modification times (see +@@ -965,6 +966,12 @@ it is preserving modification times (see 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). @@ -526,54 +349,28 @@ 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 -@@ -1378,7 +1385,7 @@ with older versions of rsync, but that a - verbose messages). - - The "%i" escape has a cryptic output that is 9 letters long. The general --format is like the string bf(YXcstpogz), where bf(Y) is replaced by the -+format is like the string bf(YXcstpogu), where bf(Y) is replaced by the - type 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. -@@ -1418,7 +1425,7 @@ 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). - it() A bf(p) means the permissions are different and are being updated to -@@ -1427,7 +1434,10 @@ quote(itemize( +@@ -1646,8 +1653,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(z) slot is reserved for future use. +- it() The bf(u) slot is reserved for reporting update (access) time changes +- (a feature that is not yet released). + 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. - )) - - One other output is possible: when deleting files, the "%i" will output + it() The bf(a) means that the ACL information changed. + it() The bf(x) slot is reserved for reporting extended attribute changes + (a feature that is not yet released). --- old/sender.c +++ new/sender.c -@@ -41,6 +41,7 @@ extern int do_progress; +@@ -43,6 +43,7 @@ extern int do_progress; extern int inplace; extern int batch_fd; extern int write_batch; +extern unsigned int file_struct_len; extern struct stats stats; - extern struct file_list *the_file_list; - extern char *stdout_format; -@@ -368,7 +369,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; + extern struct file_list *cur_flist, *first_flist, *dir_flist; --- old/testsuite/atimes.test +++ new/testsuite/atimes.test @@ -599,16 +396,7 @@ After applying this patch, run these commands for a successful build: +exit 0 --- 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() { +@@ -187,6 +187,10 @@ checkit() { # We can just write everything to stdout/stderr, because the # wrapper hides it unless there is a problem. @@ -619,7 +407,7 @@ After applying this patch, run these commands for a successful build: echo "Running: \"$1\"" eval "$1" status=$? -@@ -191,10 +195,13 @@ checkit() { +@@ -194,10 +198,13 @@ checkit() { failed="YES"; fi @@ -636,42 +424,34 @@ After applying this patch, run these commands for a successful build: --- old/tls.c +++ new/tls.c -@@ -34,6 +34,7 @@ - * change. */ - - #include "rsync.h" -+#include "popt.h" +@@ -104,6 +104,8 @@ static int stat_xattr(const char *fname, - #define PROGRAM "tls" - -@@ -43,6 +44,8 @@ int read_only = 1; - int list_only = 0; - int preserve_perms = 0; + #endif +static int display_atime = 0; + static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", -@@ -50,12 +53,29 @@ static void failed(char const *what, cha +@@ -111,12 +113,29 @@ static void failed(char const *what, cha exit(1); } -+static void storetime(char *dest, time_t t) ++static void storetime(char *dest, time_t t, size_t destsize) +{ + if (t) { + struct tm *mt = gmtime(&t); + -+ sprintf(dest, "%04d-%02d-%02d %02d:%02d:%02d ", ++ 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 { -+ strcpy(dest, " "); -+ } ++ } else ++ strlcpy(dest, " ", destsize); +} + static void list_file(const char *fname) @@ -685,29 +465,29 @@ After applying this patch, run these commands for a successful build: char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -88,19 +108,8 @@ static void list_file(const char *fname) +@@ -153,19 +172,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); - if (buf.st_mtime) { - mt = gmtime(&buf.st_mtime); - -- sprintf(datebuf, "%04d-%02d-%02d %02d:%02d:%02d", +- 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); -- } else { -- strcpy(datebuf, " "); -- } -+ storetime(mtimebuf, buf.st_mtime); -+ storetime(atimebuf, buf.st_atime); +- } else +- strlcpy(datebuf, " ", sizeof datebuf); ++ storetime(mtimebuf, buf.st_mtime, sizeof mtimebuf); ++ storetime(atimebuf, buf.st_atime, sizeof atimebuf); /* TODO: Perhaps escape special characters in fname? */ -@@ -111,23 +120,55 @@ static void list_file(const char *fname) +@@ -176,13 +184,15 @@ 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); @@ -715,75 +495,36 @@ After applying this patch, run these commands for a successful build: + 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 : "", ++ mtimebuf, display_atime && !S_ISDIR(buf.st_mode) ? 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; - } + static struct poptOption long_options[] = { + /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ ++ {"atime", 'u', POPT_ARG_NONE, &display_atime, 0, 0, 0}, + #ifdef SUPPORT_XATTRS + {"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 }, + #endif +@@ -196,6 +206,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"); ++ rprintf(F," -U, --atimes display access (last-used) times\n"); + #ifdef SUPPORT_XATTRS + fprintf(F," -f, --fake-super display attributes including fake-super xattrs\n"); + #endif --- old/util.c +++ new/util.c -@@ -121,7 +121,7 @@ void overflow_exit(char *str) +@@ -122,7 +122,7 @@ NORETURN void overflow_exit(const char * 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, mode_t mode) ++int set_times(const char *fname, time_t modtime, time_t atime, mode_t mode) { #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(mode)) -@@ -129,9 +129,13 @@ int set_modtime(char *fname, time_t modt +@@ -130,9 +130,13 @@ int set_modtime(const char *fname, time_ #endif if (verbose > 2) { @@ -799,7 +540,7 @@ After applying this patch, run these commands for a successful build: } if (dry_run) -@@ -140,7 +144,7 @@ int set_modtime(char *fname, time_t modt +@@ -141,7 +145,7 @@ int set_modtime(const char *fname, time_ { #ifdef HAVE_UTIMES struct timeval t[2]; @@ -808,7 +549,7 @@ After applying this patch, run these commands for a successful build: t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -151,12 +155,12 @@ int set_modtime(char *fname, time_t modt +@@ -154,12 +158,12 @@ int set_modtime(const char *fname, time_ return utimes(fname, t); #elif defined HAVE_UTIMBUF struct utimbuf tbuf;