X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/a54a2c4d2d84418b6658697c7926321278e1e34f..6240d1e484dd4e3cc4d0dad8d47d58193354784e:/atimes.diff diff --git a/atimes.diff b/atimes.diff index cdd6134..20489e6 100644 --- a/atimes.diff +++ b/atimes.diff @@ -9,24 +9,24 @@ TODO: need to fix this to handle 64-bit time_t values! --- old/compat.c +++ new/compat.c -@@ -45,6 +45,7 @@ extern int prune_empty_dirs; - extern int protocol_version; +@@ -44,6 +44,7 @@ extern int protocol_version; + extern int protect_args; 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; -@@ -59,7 +60,7 @@ extern char *dest_option; - extern struct filter_list_struct filter_list; + extern int need_messages_from_generator; +@@ -60,7 +61,7 @@ extern iconv_t ic_send, ic_recv; + #endif /* 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; + #ifdef ICONV_OPTION + int ic_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 -@@ -100,6 +101,8 @@ void setup_protocol(int f_out,int f_in) +@@ -122,6 +123,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -37,50 +37,23 @@ TODO: need to fix this to handle 64-bit time_t values! if (preserve_xattrs) --- old/flist.c +++ new/flist.c -@@ -52,6 +52,7 @@ extern int preserve_devices; - extern int preserve_specials; +@@ -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; -@@ -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 = atimes_ndx ? F_ATIME(f) : 0; - double len; - - if (!F_IS_ACTIVE(f)) { -@@ -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), -+ 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)); - } - } -@@ -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) +@@ -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) { static time_t modtime; + static time_t atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -446,6 +451,13 @@ static void send_file_entry(int f, struc +@@ -438,6 +440,13 @@ static void send_file_entry(int f, struc xflags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -94,7 +67,7 @@ TODO: need to fix this to handle 64-bit time_t values! #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -517,6 +529,8 @@ static void send_file_entry(int f, struc +@@ -511,6 +520,8 @@ static void send_file_entry(int f, struc } if (!(xflags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -103,7 +76,7 @@ TODO: need to fix this to handle 64-bit time_t values! if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -603,7 +617,7 @@ static void send_file_entry(int f, struc +@@ -597,7 +608,7 @@ static void send_file_entry(int f, struc static struct file_struct *recv_file_entry(struct file_list *flist, int xflags, int f) { @@ -112,7 +85,7 @@ TODO: need to fix this to handle 64-bit time_t values! static mode_t mode; static int64 dev; static dev_t rdev; -@@ -739,6 +753,16 @@ static struct file_struct *recv_file_ent +@@ -728,6 +739,16 @@ static struct file_struct *recv_file_ent } if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -129,7 +102,7 @@ TODO: need to fix this to handle 64-bit time_t values! if (chmod_modes && !S_ISLNK(mode)) mode = tweak_mode(mode, chmod_modes); -@@ -867,6 +891,8 @@ static struct file_struct *recv_file_ent +@@ -856,6 +877,8 @@ static struct file_struct *recv_file_ent F_GROUP(file) = gid; file->flags |= gid_flags; } @@ -138,7 +111,7 @@ TODO: need to fix this to handle 64-bit time_t values! #ifdef ICONV_OPTION if (ic_ndx) F_NDX(file) = flist->used + flist->ndx_start; -@@ -1181,6 +1207,8 @@ struct file_struct *make_file(const char +@@ -1182,6 +1205,8 @@ struct file_struct *make_file(const char F_OWNER(file) = st.st_uid; if (gid_ndx) F_GROUP(file) = st.st_gid; @@ -157,26 +130,53 @@ TODO: need to fix this to handle 64-bit time_t values! extern int uid_ndx; extern int gid_ndx; extern int delete_mode; -@@ -563,6 +564,9 @@ void itemize(const char *fnamecmp, struc +@@ -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(F_ATIME(file), sxp->st.st_atime) != 0) + iflags |= ITEM_REPORT_ATIME; - if (!BITS_EQUAL(sxp->st.st_mode, file->mode, CHMOD_BITS)) - iflags |= ITEM_REPORT_PERMS; - if (uid_ndx && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid) -@@ -880,6 +884,8 @@ static int try_dests_reg(struct file_str + #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, sxp, NULL, 0); if (preserve_hard_links && F_IS_HLINKED(file)) - finish_hard_link(file, fname, &sxp->st, itemizing, code, j); + finish_hard_link(file, fname, ndx, &sxp->st, itemizing, code, j); if (itemizing && (verbose > 1 || stdout_format_has_i > 1)) { -@@ -1774,7 +1780,7 @@ static void touch_up_dirs(struct file_li +@@ -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; + + if (!F_IS_ACTIVE(f)) { +@@ -1094,14 +1101,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), ++ 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) @@ -199,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_specials = 0; +@@ -57,6 +57,7 @@ int preserve_specials = 0; int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; @@ -207,7 +207,7 @@ TODO: need to fix this to handle 64-bit time_t values! int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -344,6 +345,7 @@ void usage(enum logcode F) +@@ -346,6 +347,7 @@ void usage(enum logcode F) rprintf(F," -D same as --devices --specials\n"); rprintf(F," -t, --times preserve modification times\n"); rprintf(F," -O, --omit-dir-times omit directories from --times\n"); @@ -215,7 +215,7 @@ TODO: need to fix this to handle 64-bit time_t values! rprintf(F," --super receiver attempts super-user activities\n"); #ifdef SUPPORT_XATTRS rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); -@@ -477,6 +479,9 @@ static struct poptOption long_options[] +@@ -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 }, @@ -225,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, 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 }, -@@ -1691,6 +1696,8 @@ void server_options(char **args,int *arg +@@ -1713,6 +1718,8 @@ void server_options(char **args, int *ar argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -236,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 -@@ -32,6 +32,7 @@ extern int preserve_acls; +@@ -33,6 +33,7 @@ extern int preserve_acls; extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; @@ -244,15 +244,15 @@ TODO: need to fix this to handle 64-bit time_t values! extern int preserve_times; extern int am_root; extern int am_server; -@@ -273,6 +274,7 @@ int set_file_attrs(const char *fname, st +@@ -343,6 +344,7 @@ int set_file_attrs(const char *fname, st int updated = 0; - statx sx2; + stat_x sx2; int change_uid, change_gid; + time_t atime, mtime; mode_t new_mode = file->mode; + int inherit; - if (!sxp) { -@@ -310,18 +312,36 @@ int set_file_attrs(const char *fname, st +@@ -383,18 +385,36 @@ int set_file_attrs(const char *fname, st set_stat_xattr(fname, file); #endif @@ -296,13 +296,13 @@ TODO: need to fix this to handle 64-bit time_t values! +++ new/rsync.h @@ -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 */ + #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. */ -@@ -144,6 +145,7 @@ +@@ -145,6 +146,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -310,15 +310,15 @@ TODO: need to fix this to handle 64-bit time_t values! #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -583,6 +585,7 @@ struct file_struct { - extern int file_extra_cnt; +@@ -586,6 +588,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; -@@ -620,6 +623,7 @@ extern int xattrs_ndx; +@@ -623,6 +626,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 @@ -328,7 +328,7 @@ TODO: need to fix this to handle 64-bit time_t values! #define F_NDX(f) REQ_EXTRA(f, ic_ndx)->num --- old/rsync.yo +++ new/rsync.yo -@@ -354,6 +354,7 @@ to the detailed description below for a +@@ -349,6 +349,7 @@ to the detailed description below for a -D same as --devices --specials -t, --times preserve modification times -O, --omit-dir-times omit directories from --times @@ -336,7 +336,7 @@ TODO: need to fix this to handle 64-bit time_t values! --super receiver attempts super-user activities --fake-super store/recover privileged attrs using xattrs -S, --sparse handle sparse files efficiently -@@ -940,6 +941,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). @@ -349,7 +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 -@@ -1602,8 +1609,10 @@ quote(itemization( +@@ -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). @@ -396,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 -@@ -186,6 +186,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. @@ -407,7 +407,7 @@ TODO: need to fix this to handle 64-bit time_t values! echo "Running: \"$1\"" eval "$1" status=$? -@@ -193,10 +197,13 @@ checkit() { +@@ -194,10 +198,13 @@ checkit() { failed="YES"; fi @@ -424,7 +424,7 @@ TODO: need to fix this to handle 64-bit time_t values! --- old/tls.c +++ new/tls.c -@@ -99,6 +99,8 @@ static int stat_xattr(const char *fname, +@@ -104,6 +104,8 @@ static int stat_xattr(const char *fname, #endif @@ -433,7 +433,7 @@ TODO: need to fix this to handle 64-bit time_t values! static void failed(char const *what, char const *where) { fprintf(stderr, PROGRAM ": %s %s: %s\n", -@@ -106,12 +108,29 @@ static void failed(char const *what, cha +@@ -111,12 +113,29 @@ static void failed(char const *what, cha exit(1); } @@ -465,7 +465,7 @@ TODO: need to fix this to handle 64-bit time_t values! char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -148,19 +167,8 @@ static void list_file(const char *fname) +@@ -153,19 +172,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -487,7 +487,7 @@ TODO: need to fix this to handle 64-bit time_t values! /* TODO: Perhaps escape special characters in fname? */ -@@ -171,13 +179,15 @@ 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); @@ -495,7 +495,7 @@ TODO: need to fix this to handle 64-bit time_t values! + 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); } @@ -505,7 +505,7 @@ TODO: need to fix this to handle 64-bit time_t values! #ifdef SUPPORT_XATTRS {"fake-super", 'f', POPT_ARG_VAL, &am_root, -1, 0, 0 }, #endif -@@ -191,6 +201,7 @@ static void tls_usage(int ret) +@@ -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"); @@ -515,7 +515,7 @@ TODO: need to fix this to handle 64-bit time_t values! #endif --- old/util.c +++ new/util.c -@@ -121,7 +121,7 @@ NORETURN void overflow_exit(const char * +@@ -122,7 +122,7 @@ NORETURN void overflow_exit(const char * exit_cleanup(RERR_MALLOC); } @@ -524,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)) -@@ -129,9 +129,13 @@ int set_modtime(const char *fname, time_ +@@ -130,9 +130,13 @@ int set_modtime(const char *fname, time_ #endif if (verbose > 2) { @@ -540,7 +540,7 @@ TODO: need to fix this to handle 64-bit time_t values! } if (dry_run) -@@ -140,7 +144,7 @@ int set_modtime(const char *fname, time_ +@@ -141,7 +145,7 @@ int set_modtime(const char *fname, time_ { #ifdef HAVE_UTIMES struct timeval t[2]; @@ -549,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; -@@ -153,12 +157,12 @@ int set_modtime(const char *fname, time_ +@@ -154,12 +158,12 @@ int set_modtime(const char *fname, time_ return utimes(fname, t); #elif defined HAVE_UTIMBUF struct utimbuf tbuf;