X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/12b04b405932934777191a34869d4136d028a555..7ce3d7e01bfcf6c44c7e31354759dae630920fd4:/atimes.diff diff --git a/atimes.diff b/atimes.diff index f9a866a..00b933a 100644 --- a/atimes.diff +++ b/atimes.diff @@ -9,41 +9,58 @@ TODO: need to fix this to handle 64-bit time_t values! --- old/compat.c +++ new/compat.c -@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in) - preserve_uid = ++file_extra_cnt; +@@ -44,6 +44,7 @@ extern int prune_empty_dirs; + extern int protocol_version; + extern int preserve_uid; + extern int preserve_gid; ++extern int preserve_atimes; + extern int preserve_acls; + extern int preserve_xattrs; + extern int preserve_hard_links; +@@ -58,7 +59,7 @@ extern char *dest_option; + extern struct filter_list_struct filter_list; + + /* These index values are for the file-list's extra-attribute array. */ +-int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx; ++int uid_ndx, gid_ndx, atimes_ndx, acls_ndx, xattrs_ndx; + + /* The server makes sure that if either side only supports a pre-release + * version of a protocol, that both sides must speak a compatible version +@@ -99,6 +100,8 @@ void setup_protocol(int f_out,int f_in) + uid_ndx = ++file_extra_cnt; if (preserve_gid) - preserve_gid = ++file_extra_cnt; + gid_ndx = ++file_extra_cnt; + if (preserve_atimes) -+ preserve_atimes = ++file_extra_cnt; ++ atimes_ndx = ++file_extra_cnt; if (preserve_acls && !am_sender) - preserve_acls = ++file_extra_cnt; + acls_ndx = ++file_extra_cnt; if (preserve_xattrs) --- old/flist.c +++ new/flist.c -@@ -51,6 +51,7 @@ extern int preserve_devices; +@@ -52,6 +52,7 @@ extern int preserve_devices; extern int preserve_specials; - extern int preserve_uid; - extern int preserve_gid; -+extern int preserve_atimes; + extern int uid_ndx; + extern int gid_ndx; ++extern int atimes_ndx; extern int relative_paths; extern int implied_dirs; extern int file_extra_cnt; -@@ -148,6 +149,7 @@ void show_flist_stats(void) +@@ -158,6 +159,7 @@ void show_flist_stats(void) static void list_file_entry(struct file_struct *f) { char permbuf[PERMSTRING_SIZE]; -+ time_t atime = preserve_atimes ? F_ATIME(f) : 0; ++ time_t atime = atimes_ndx ? F_ATIME(f) : 0; double len; if (!F_IS_ACTIVE(f)) { -@@ -162,14 +164,16 @@ static void list_file_entry(struct file_ +@@ -172,14 +174,16 @@ static void list_file_entry(struct file_ #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), -+ preserve_atimes ? timestring(atime) : "", ++ atimes_ndx ? timestring(atime) : "", f_name(f, NULL), F_SYMLINK(f)); } else #endif @@ -51,11 +68,11 @@ TODO: need to fix this to handle 64-bit time_t values! - rprintf(FINFO, "%s %11.0f %s %s\n", + rprintf(FINFO, "%s %11.0f %s %s %s\n", permbuf, len, timestring(f->modtime), -+ preserve_atimes ? timestring(atime) : "", ++ atimes_ndx ? timestring(atime) : "", f_name(f, NULL)); } } -@@ -333,6 +337,7 @@ int push_flist_dir(const char *dir, int +@@ -347,6 +351,7 @@ int push_pathname(const char *dir, int l static void send_file_entry(int f, struct file_struct *file, int ndx) { static time_t modtime; @@ -63,43 +80,43 @@ TODO: need to fix this to handle 64-bit time_t values! static mode_t mode; static int64 dev; static dev_t rdev; -@@ -400,6 +405,13 @@ static void send_file_entry(int f, struc - flags |= XMIT_SAME_TIME; +@@ -446,6 +451,13 @@ static void send_file_entry(int f, struc + xflags |= XMIT_SAME_TIME; else modtime = file->modtime; -+ if (preserve_atimes && !S_ISDIR(mode)) { ++ if (atimes_ndx && !S_ISDIR(mode)) { + time_t file_atime = F_ATIME(file); + if (file_atime == atime) -+ flags |= XMIT_SAME_ATIME; ++ xflags |= XMIT_SAME_ATIME; + else + atime = file_atime; + } #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -471,6 +483,8 @@ static void send_file_entry(int f, struc +@@ -517,6 +529,8 @@ static void send_file_entry(int f, struc } - if (!(flags & XMIT_SAME_MODE)) + if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); -+ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) ++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) + write_varlong(f, atime, 4); - if (preserve_uid && !(flags & XMIT_SAME_UID)) { + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -557,7 +571,7 @@ static void send_file_entry(int f, struc +@@ -603,7 +617,7 @@ static void send_file_entry(int f, struc static struct file_struct *recv_file_entry(struct file_list *flist, - int flags, int f) + int xflags, int f) { - static int64 modtime; + static int64 modtime, atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -666,6 +680,16 @@ static struct file_struct *recv_file_ent +@@ -739,6 +753,16 @@ static struct file_struct *recv_file_ent } - if (!(flags & XMIT_SAME_MODE)) + if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); -+ if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) { ++ 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) { @@ -112,35 +129,35 @@ TODO: need to fix this to handle 64-bit time_t values! if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -790,6 +814,8 @@ static struct file_struct *recv_file_ent - F_OWNER(file) = uid; - if (preserve_gid) +@@ -867,6 +891,8 @@ static struct file_struct *recv_file_ent F_GROUP(file) = gid; -+ if (preserve_atimes) + file->flags |= gid_flags; + } ++ if (atimes_ndx) + F_ATIME(file) = (time_t)atime; - - if (basename != thisname) { - file->dirname = lastdir; -@@ -1099,6 +1125,8 @@ struct file_struct *make_file(const char + #ifdef ICONV_OPTION + if (ic_ndx) + F_NDX(file) = flist->used + flist->ndx_start; +@@ -1191,6 +1217,8 @@ struct file_struct *make_file(const char F_OWNER(file) = st.st_uid; - if (preserve_gid) + if (gid_ndx) F_GROUP(file) = st.st_gid; -+ if (preserve_atimes) ++ if (atimes_ndx) + F_ATIME(file) = st.st_atime; if (basename != thisname) file->dirname = lastdir; --- old/generator.c +++ new/generator.c -@@ -45,6 +45,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 delete_mode; - extern int delete_before; -@@ -561,6 +562,9 @@ void itemize(const char *fnamecmp, struc + extern int uid_ndx; + extern int gid_ndx; +@@ -564,6 +565,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; @@ -149,36 +166,28 @@ TODO: need to fix this to handle 64-bit time_t values! + iflags |= ITEM_REPORT_ATIME; if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) iflags |= ITEM_REPORT_PERMS; - if (preserve_uid && am_root && F_UID(file) != sxp->st.st_uid) -@@ -878,6 +882,8 @@ static int try_dests_reg(struct file_str + if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) +@@ -881,6 +885,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, sxp, 0); ++ set_file_attrs(fname, file, sxp, NULL, 0); if (preserve_hard_links && F_IS_HLINKED(file)) finish_hard_link(file, fname, &sxp->st, itemizing, code, j); if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { -@@ -1741,7 +1747,7 @@ static void touch_up_dirs(struct file_li +@@ -1775,7 +1781,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 && !(++j % lull_mod)) + if (allowed_lull && !(counter % lull_mod)) maybe_send_keepalive(); - else if (!(j % 200)) + else if (!(counter & 0xFF)) --- old/log.c +++ new/log.c -@@ -36,6 +36,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 preserve_uid; - extern int preserve_gid; - extern int stdout_format_has_i; -@@ -624,7 +625,8 @@ static void log_formatted(enum logcode c +@@ -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'; @@ -190,7 +199,7 @@ TODO: need to fix this to handle 64-bit time_t values! c[11] = '\0'; --- old/options.c +++ new/options.c -@@ -56,6 +56,7 @@ int preserve_uid = 0; +@@ -57,6 +57,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int omit_dir_times = 0; @@ -198,19 +207,15 @@ TODO: need to fix this to handle 64-bit time_t values! int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -325,8 +326,9 @@ void usage(enum logcode F) - rprintf(F," --devices preserve device files (super-user only)\n"); - rprintf(F," --specials preserve special files\n"); +@@ -338,6 +339,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," -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"); #ifdef SUPPORT_XATTRS rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); -@@ -456,6 +458,9 @@ static struct poptOption long_options[] +@@ -473,6 +475,9 @@ static struct poptOption long_options[] {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, {"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, {"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 }, @@ -220,7 +225,7 @@ TODO: need to fix this to handle 64-bit time_t values! {"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 }, -@@ -1617,6 +1622,8 @@ void server_options(char **args,int *arg +@@ -1675,6 +1680,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -231,7 +236,7 @@ TODO: need to fix this to handle 64-bit time_t values! else if (preserve_executability && am_sender) --- old/rsync.c +++ new/rsync.c -@@ -35,6 +35,7 @@ extern int preserve_acls; +@@ -32,6 +32,7 @@ extern int preserve_acls; extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; @@ -239,7 +244,7 @@ TODO: need to fix this to handle 64-bit time_t values! extern int preserve_times; extern int omit_dir_times; extern int am_root; -@@ -224,6 +225,7 @@ int set_file_attrs(const char *fname, st +@@ -274,6 +275,7 @@ int set_file_attrs(const char *fname, st int updated = 0; statx sx2; int change_uid, change_gid; @@ -247,7 +252,7 @@ TODO: need to fix this to handle 64-bit time_t values! mode_t new_mode = file->mode; if (!sxp) { -@@ -261,18 +263,36 @@ int set_file_attrs(const char *fname, st +@@ -311,18 +313,36 @@ int set_file_attrs(const char *fname, st set_stat_xattr(fname, file); #endif @@ -286,18 +291,18 @@ TODO: need to fix this to handle 64-bit time_t values! + updated = 0; } - change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file); + change_uid = am_root && uid_ndx && sxp->st.st_uid != (uid_t)F_OWNER(file); --- old/rsync.h +++ new/rsync.h -@@ -56,6 +56,7 @@ +@@ -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 */ + #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. */ -@@ -141,6 +142,7 @@ +@@ -144,6 +145,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -305,37 +310,33 @@ TODO: need to fix this to handle 64-bit time_t values! #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -573,6 +575,7 @@ struct file_struct { +@@ -583,6 +585,7 @@ struct file_struct { extern int file_extra_cnt; - extern int preserve_uid; - extern int preserve_gid; -+extern int preserve_atimes; - extern int preserve_acls; - extern int preserve_xattrs; + extern int uid_ndx; + extern int gid_ndx; ++extern int atimes_ndx; + extern int acls_ndx; + extern int xattrs_ndx; -@@ -607,6 +610,7 @@ extern int preserve_xattrs; +@@ -620,6 +623,7 @@ extern int xattrs_ndx; /* When the associated option is on, all entries will have these present: */ - #define F_OWNER(f) REQ_EXTRA(f, preserve_uid)->unum - #define F_GROUP(f) REQ_EXTRA(f, preserve_gid)->unum -+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum - #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num - #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num - + #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 -@@ -330,8 +330,9 @@ to the detailed description below for a - --devices preserve device files (super-user only) - --specials preserve special files +@@ -353,6 +353,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 -@@ -909,6 +910,12 @@ it is preserving modification times (see +@@ -930,6 +931,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). @@ -348,16 +349,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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 -@@ -1523,7 +1530,7 @@ quote(itemization( - 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 -@@ -1532,8 +1539,10 @@ quote(itemization( +@@ -1592,8 +1599,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). @@ -378,7 +370,7 @@ TODO: need to fix this to handle 64-bit time_t values! extern int write_batch; +extern unsigned int file_struct_len; extern struct stats stats; - extern struct file_list *cur_flist, *first_flist; + extern struct file_list *cur_flist, *first_flist, *dir_flist; --- old/testsuite/atimes.test +++ new/testsuite/atimes.test @@ -404,7 +396,7 @@ TODO: need to fix this to handle 64-bit time_t values! +exit 0 --- old/testsuite/rsync.fns +++ new/testsuite/rsync.fns -@@ -184,6 +184,10 @@ checkit() { +@@ -186,6 +186,10 @@ checkit() { # We can just write everything to stdout/stderr, because the # wrapper hides it unless there is a problem. @@ -415,7 +407,7 @@ TODO: need to fix this to handle 64-bit time_t values! echo "Running: \"$1\"" eval "$1" status=$? -@@ -191,10 +195,13 @@ checkit() { +@@ -193,10 +197,13 @@ checkit() { failed="YES"; fi @@ -432,16 +424,16 @@ TODO: need to fix this to handle 64-bit time_t values! --- old/tls.c +++ new/tls.c -@@ -94,6 +94,8 @@ static int stat_xattr(const char *fname, - return 0; - } +@@ -99,6 +99,8 @@ static int stat_xattr(const char *fname, + + #endif +static int display_atime = 0; + static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", -@@ -101,12 +103,29 @@ static void failed(char const *what, cha +@@ -106,12 +108,29 @@ static void failed(char const *what, cha exit(1); } @@ -473,7 +465,7 @@ TODO: need to fix this to handle 64-bit time_t values! char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -141,19 +160,8 @@ static void list_file(const char *fname) +@@ -148,19 +167,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -495,7 +487,7 @@ TODO: need to fix this to handle 64-bit time_t values! /* TODO: Perhaps escape special characters in fname? */ -@@ -164,13 +172,15 @@ static void list_file(const char *fname) +@@ -171,13 +179,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); @@ -510,20 +502,20 @@ TODO: need to fix this to handle 64-bit time_t values! 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 }, - {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, - {0,0,0,0,0,0,0} -@@ -182,6 +192,7 @@ static void tls_usage(int ret) + #endif +@@ -191,6 +201,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"); - fprintf(F," -h, --help show this help\n"); - exit(ret); + #endif --- old/util.c +++ new/util.c -@@ -120,7 +120,7 @@ NORETURN void overflow_exit(const char * +@@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char * exit_cleanup(RERR_MALLOC); } @@ -532,7 +524,7 @@ TODO: need to fix this to handle 64-bit time_t values! { #if !defined HAVE_LUTIMES || !defined HAVE_UTIMES if (S_ISLNK(mode)) -@@ -128,9 +128,13 @@ int set_modtime(const char *fname, time_ +@@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_ #endif if (verbose > 2) { @@ -548,7 +540,7 @@ TODO: need to fix this to handle 64-bit time_t values! } if (dry_run) -@@ -139,7 +143,7 @@ int set_modtime(const char *fname, time_ +@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_ { #ifdef HAVE_UTIMES struct timeval t[2]; @@ -557,7 +549,7 @@ TODO: need to fix this to handle 64-bit time_t values! t[0].tv_usec = 0; t[1].tv_sec = modtime; t[1].tv_usec = 0; -@@ -152,12 +156,12 @@ int set_modtime(const char *fname, time_ +@@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_ return utimes(fname, t); #elif defined HAVE_UTIMBUF struct utimbuf tbuf;