X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/898a2112e681761ce68f6f3aca9ed78921699963..8e65e95897d45f2f9912349580c977c6e0a5cfc7:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 2bd9c8a..cdd6134 100644 --- a/atimes.diff +++ b/atimes.diff @@ -9,7 +9,7 @@ TODO: need to fix this to handle 64-bit time_t values! --- old/compat.c +++ new/compat.c -@@ -43,6 +43,7 @@ extern int prune_empty_dirs; +@@ -45,6 +45,7 @@ extern int prune_empty_dirs; extern int protocol_version; extern int preserve_uid; extern int preserve_gid; @@ -17,7 +17,7 @@ TODO: need to fix this to handle 64-bit time_t values! extern int preserve_acls; extern int preserve_xattrs; extern int preserve_hard_links; -@@ -57,7 +58,7 @@ extern char *dest_option; +@@ -59,7 +60,7 @@ extern char *dest_option; extern struct filter_list_struct filter_list; /* These index values are for the file-list's extra-attribute array. */ @@ -26,7 +26,7 @@ TODO: need to fix this to handle 64-bit time_t values! /* 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 -@@ -98,6 +99,8 @@ void setup_protocol(int f_out,int f_in) +@@ -100,6 +101,8 @@ void setup_protocol(int f_out,int f_in) uid_ndx = ++file_extra_cnt; if (preserve_gid) gid_ndx = ++file_extra_cnt; @@ -80,30 +80,30 @@ TODO: need to fix this to handle 64-bit time_t values! static mode_t mode; static int64 dev; static dev_t rdev; -@@ -442,6 +447,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 (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) { -@@ -513,6 +525,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 (atimes_ndx && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) ++ if (atimes_ndx && !S_ISDIR(mode) && !(xflags & XMIT_SAME_ATIME)) + write_varlong(f, atime, 4); - if (uid_ndx && !(flags & XMIT_SAME_UID)) { + if (uid_ndx && !(xflags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -599,7 +613,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 xflags, int f) { @@ -112,7 +112,7 @@ TODO: need to fix this to handle 64-bit time_t values! static mode_t mode; static int64 dev; static dev_t rdev; -@@ -735,6 +749,16 @@ static struct file_struct *recv_file_ent +@@ -739,6 +753,16 @@ static struct file_struct *recv_file_ent } if (!(xflags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -129,7 +129,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); -@@ -863,6 +887,8 @@ static struct file_struct *recv_file_ent +@@ -867,6 +891,8 @@ static struct file_struct *recv_file_ent F_GROUP(file) = gid; file->flags |= gid_flags; } @@ -137,8 +137,8 @@ TODO: need to fix this to handle 64-bit time_t values! + F_ATIME(file) = (time_t)atime; #ifdef ICONV_OPTION if (ic_ndx) - F_NDX(file) = flist->count + flist->ndx_start; -@@ -1182,6 +1208,8 @@ struct file_struct *make_file(const char + F_NDX(file) = flist->used + flist->ndx_start; +@@ -1181,6 +1207,8 @@ struct file_struct *make_file(const char F_OWNER(file) = st.st_uid; if (gid_ndx) F_GROUP(file) = st.st_gid; @@ -154,9 +154,9 @@ TODO: need to fix this to handle 64-bit time_t values! 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; @@ -563,6 +564,9 @@ void itemize(const char *fnamecmp, struc && (!(iflags & ITEM_XNAME_FOLLOWS) || *xname)) || (keep_time && cmp_time(file->modtime, sxp->st.st_mtime) != 0)) @@ -176,7 +176,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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)) { -@@ -1749,7 +1755,7 @@ static void touch_up_dirs(struct file_li +@@ -1774,7 +1780,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,37 +199,33 @@ 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; +@@ -56,6 +56,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; -@@ -335,8 +336,9 @@ void usage(enum logcode F) - rprintf(F," --devices preserve device files (super-user only)\n"); - rprintf(F," --specials preserve special files\n"); +@@ -344,6 +345,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"); -@@ -471,6 +473,9 @@ static struct poptOption long_options[] - {"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 }, +@@ -477,6 +479,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-U", 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 }, -@@ -1668,6 +1673,8 @@ void server_options(char **args,int *arg + {"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 argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -246,9 +242,9 @@ TODO: need to fix this to handle 64-bit time_t values! extern int preserve_executability; +extern int preserve_atimes; extern int preserve_times; - extern int omit_dir_times; extern int am_root; -@@ -275,6 +276,7 @@ int set_file_attrs(const char *fname, st + extern int am_server; +@@ -273,6 +274,7 @@ int set_file_attrs(const char *fname, st int updated = 0; statx sx2; int change_uid, change_gid; @@ -256,13 +252,13 @@ TODO: need to fix this to handle 64-bit time_t values! mode_t new_mode = file->mode; if (!sxp) { -@@ -312,18 +314,36 @@ int set_file_attrs(const char *fname, st +@@ -310,18 +312,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(sxp->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(sxp->st.st_mode)) + flags |= ATTRS_SKIP_ATIME; @@ -298,15 +294,15 @@ TODO: need to fix this to handle 64-bit time_t values! 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. */ -@@ -143,6 +144,7 @@ +@@ -144,6 +145,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -314,7 +310,7 @@ TODO: need to fix this to handle 64-bit time_t values! #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -582,6 +584,7 @@ struct file_struct { +@@ -583,6 +585,7 @@ struct file_struct { extern int file_extra_cnt; extern int uid_ndx; extern int gid_ndx; @@ -322,7 +318,7 @@ TODO: need to fix this to handle 64-bit time_t values! extern int acls_ndx; extern int xattrs_ndx; -@@ -616,6 +619,7 @@ extern int xattrs_ndx; +@@ -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, uid_ndx)->unum #define F_GROUP(f) REQ_EXTRA(f, gid_ndx)->unum @@ -332,19 +328,15 @@ 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 -@@ -336,8 +336,9 @@ to the detailed description below for a - --devices preserve device files (super-user only) - --specials preserve special files +@@ -354,6 +354,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 -@@ -916,6 +917,12 @@ it is preserving modification times (see +@@ -940,6 +941,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). @@ -357,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 -@@ -1530,7 +1537,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 -@@ -1539,8 +1546,10 @@ quote(itemization( +@@ -1602,8 +1609,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). @@ -387,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 @@ -441,7 +424,7 @@ TODO: need to fix this to handle 64-bit time_t values! --- old/tls.c +++ new/tls.c -@@ -98,6 +98,8 @@ static int stat_xattr(const char *fname, +@@ -99,6 +99,8 @@ static int stat_xattr(const char *fname, #endif @@ -450,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", -@@ -105,12 +107,29 @@ static void failed(char const *what, cha +@@ -106,12 +108,29 @@ static void failed(char const *what, cha exit(1); } @@ -482,7 +465,7 @@ TODO: need to fix this to handle 64-bit time_t values! char linkbuf[4096]; if (do_lstat(fname, &buf) < 0) -@@ -147,19 +166,8 @@ static void list_file(const char *fname) +@@ -148,19 +167,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -504,7 +487,7 @@ TODO: need to fix this to handle 64-bit time_t values! /* TODO: Perhaps escape special characters in fname? */ -@@ -170,13 +178,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); @@ -522,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 -@@ -190,6 +200,7 @@ static void tls_usage(int ret) +@@ -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");