X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/5795bf59eae77f5d56b33a883708280b458f9fca..92796ae335c30ae51fc3aebd079a9f0246dae79d:/atimes.diff diff --git a/atimes.diff b/atimes.diff index cf22482..d19782c 100644 --- a/atimes.diff +++ b/atimes.diff @@ -5,10 +5,11 @@ To use this patch, run these commands for a successful build: ./configure (optional if already run) make +TODO: need to fix this to handle 64-bit time_t values! --- old/compat.c +++ new/compat.c -@@ -64,6 +64,8 @@ void setup_protocol(int f_out,int f_in) +@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in) preserve_uid = ++file_extra_cnt; if (preserve_gid) preserve_gid = ++file_extra_cnt; @@ -19,7 +20,7 @@ To use this patch, run these commands for a successful build: if (preserve_xattrs) --- old/flist.c +++ new/flist.c -@@ -50,6 +50,7 @@ extern int preserve_devices; +@@ -51,6 +51,7 @@ extern int preserve_devices; extern int preserve_specials; extern int preserve_uid; extern int preserve_gid; @@ -27,7 +28,7 @@ To use this patch, run these commands for a successful build: extern int relative_paths; extern int implied_dirs; extern int file_extra_cnt; -@@ -147,6 +148,7 @@ void show_flist_stats(void) +@@ -154,6 +155,7 @@ void show_flist_stats(void) static void list_file_entry(struct file_struct *f) { char permbuf[PERMSTRING_SIZE]; @@ -35,7 +36,7 @@ To use this patch, run these commands for a successful build: double len; if (!F_IS_ACTIVE(f)) { -@@ -161,14 +163,16 @@ static void list_file_entry(struct file_ +@@ -168,14 +170,16 @@ static void list_file_entry(struct file_ #ifdef SUPPORT_LINKS if (preserve_links && S_ISLNK(f->mode)) { @@ -54,7 +55,7 @@ To use this patch, run these commands for a successful build: f_name(f, NULL)); } } -@@ -352,6 +356,7 @@ int push_flist_dir(const char *dir, int +@@ -339,6 +343,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; @@ -62,7 +63,7 @@ To use this patch, run these commands for a successful build: static mode_t mode; static int64 dev; static dev_t rdev; -@@ -419,6 +424,13 @@ static void send_file_entry(int f, struc +@@ -434,6 +439,13 @@ static void send_file_entry(int f, struc flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -76,43 +77,51 @@ To use this patch, run these commands for a successful build: #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -486,6 +498,8 @@ static void send_file_entry(int f, struc - write_int(f, modtime); +@@ -505,6 +517,8 @@ static void send_file_entry(int f, struc + } if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); + if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) -+ write_int(f, atime); ++ write_varlong(f, atime, 4); if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -572,7 +586,7 @@ static void send_file_entry(int f, struc +@@ -591,7 +605,7 @@ static void send_file_entry(int f, struc static struct file_struct *recv_file_entry(struct file_list *flist, int flags, int f) { -- static time_t modtime; -+ static time_t modtime, atime; +- static int64 modtime; ++ static int64 modtime, atime; static mode_t mode; static int64 dev; static dev_t rdev; -@@ -670,6 +684,8 @@ static struct file_struct *recv_file_ent - modtime = (time_t)read_int(f); +@@ -725,6 +739,16 @@ static struct file_struct *recv_file_ent + } if (!(flags & 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 (preserve_atimes && !S_ISDIR(mode) && !(flags & 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); -@@ -794,6 +810,8 @@ static struct file_struct *recv_file_ent +@@ -850,6 +874,8 @@ static struct file_struct *recv_file_ent F_OWNER(file) = uid; if (preserve_gid) F_GROUP(file) = gid; + if (preserve_atimes) -+ F_ATIME(file) = atime; - - if (basename != thisname) { - file->dirname = lastdir; -@@ -1103,6 +1121,8 @@ struct file_struct *make_file(const char ++ F_ATIME(file) = (time_t)atime; + #ifdef ICONV_OPTION + if (ic_ndx) + F_NDX(file) = flist->count + flist->ndx_start; +@@ -1163,6 +1189,8 @@ struct file_struct *make_file(const char F_OWNER(file) = st.st_uid; if (preserve_gid) F_GROUP(file) = st.st_gid; @@ -131,7 +140,7 @@ To use this patch, run these commands for a successful build: extern int omit_dir_times; extern int delete_mode; extern int delete_before; -@@ -561,6 +562,9 @@ void itemize(const char *fnamecmp, struc +@@ -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)) iflags |= ITEM_REPORT_TIME; @@ -141,16 +150,16 @@ To use this patch, run these commands for a successful build: 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 +@@ -880,6 +884,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 +@@ -1743,7 +1749,7 @@ static void touch_up_dirs(struct file_li if (!(file->mode & S_IWUSR)) do_chmod(fname, file->mode); if (need_retouch_dir_times) @@ -161,7 +170,7 @@ To use this patch, run these commands for a successful build: else if (!(j % 200)) --- old/log.c +++ new/log.c -@@ -36,6 +36,7 @@ extern int msg_fd_out; +@@ -34,6 +34,7 @@ extern int msg_fd_out; extern int allow_8bit_chars; extern int protocol_version; extern int preserve_times; @@ -169,7 +178,7 @@ To use this patch, run these commands for a successful build: 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 +@@ -630,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'; @@ -189,7 +198,7 @@ To use this patch, run these commands for a successful build: int update_only = 0; int cvs_exclude = 0; int dry_run = 0; -@@ -323,8 +324,9 @@ void usage(enum logcode F) +@@ -334,8 +335,9 @@ void usage(enum logcode F) rprintf(F," --devices preserve device files (super-user only)\n"); rprintf(F," --specials preserve special files\n"); rprintf(F," -D same as --devices --specials\n"); @@ -197,11 +206,11 @@ To use this patch, run these commands for a successful build: - 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," -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"); -@@ -451,6 +453,9 @@ static struct poptOption long_options[] + #ifdef SUPPORT_XATTRS + rprintf(F," --fake-super store/recover privileged attrs using xattrs\n"); +@@ -468,6 +470,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 }, @@ -211,7 +220,7 @@ To use this patch, run these commands for a successful build: {"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 }, -@@ -1603,6 +1608,8 @@ void server_options(char **args,int *arg +@@ -1652,6 +1657,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -222,7 +231,7 @@ To use this patch, run these commands for a successful build: 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; @@ -230,7 +239,7 @@ To use this patch, run these commands for a successful build: extern int preserve_times; extern int omit_dir_times; extern int am_root; -@@ -228,6 +229,7 @@ int set_file_attrs(const char *fname, st +@@ -271,6 +272,7 @@ int set_file_attrs(const char *fname, st int updated = 0; statx sx2; int change_uid, change_gid; @@ -238,8 +247,8 @@ To use this patch, run these commands for a successful build: mode_t new_mode = file->mode; if (!sxp) { -@@ -263,18 +265,36 @@ int set_file_attrs(const char *fname, st - set_xattr(fname, file, fnamecmp, sxp); +@@ -308,18 +310,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 @@ -288,7 +297,7 @@ To use this patch, run these commands for a successful build: /* These flags are used in the live flist data. */ -@@ -136,6 +137,7 @@ +@@ -141,6 +142,7 @@ #define ATTRS_REPORT (1<<0) #define ATTRS_SKIP_MTIME (1<<1) @@ -296,7 +305,7 @@ To use this patch, run these commands for a successful build: #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -568,6 +570,7 @@ struct file_struct { +@@ -582,6 +584,7 @@ struct file_struct { extern int file_extra_cnt; extern int preserve_uid; extern int preserve_gid; @@ -304,14 +313,14 @@ To use this patch, run these commands for a successful build: extern int preserve_acls; extern int preserve_xattrs; -@@ -602,6 +605,7 @@ extern int preserve_xattrs; +@@ -616,6 +619,7 @@ extern int preserve_xattrs; /* 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_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 @@ -324,9 +333,9 @@ To use this patch, run these commands for a successful build: + -O, --omit-dir-times omit directories when preserving mod-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 -@@ -902,6 +903,12 @@ it is preserving modification times (see +@@ -910,6 +911,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). @@ -339,7 +348,7 @@ To use 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 -@@ -1488,7 +1495,7 @@ quote(itemization( +@@ -1524,7 +1531,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) @@ -348,7 +357,7 @@ To use this patch, run these commands for a successful build: 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 -@@ -1497,8 +1504,10 @@ quote(itemization( +@@ -1533,8 +1540,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). @@ -395,16 +404,7 @@ To use 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() { +@@ -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 +415,7 @@ To use this patch, run these commands for a successful build: echo "Running: \"$1\"" eval "$1" status=$? -@@ -191,10 +195,13 @@ checkit() { +@@ -193,10 +197,13 @@ checkit() { failed="YES"; fi @@ -432,24 +432,16 @@ To use this patch, run these commands for a successful build: --- old/tls.c +++ new/tls.c -@@ -34,6 +34,7 @@ - * change. */ +@@ -98,6 +98,8 @@ static int stat_xattr(const char *fname, - #include "rsync.h" -+#include "popt.h" - - #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 +@@ -105,12 +107,29 @@ static void failed(char const *what, cha exit(1); } @@ -481,7 +473,7 @@ To use 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) +@@ -147,19 +166,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -503,7 +495,7 @@ To use this patch, run these commands for a successful build: /* TODO: Perhaps escape special characters in fname? */ -@@ -111,23 +120,55 @@ static void list_file(const char *fname) +@@ -170,13 +178,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); @@ -513,61 +505,22 @@ To use this patch, run these commands for a successful build: - datebuf, fname, linkbuf); + 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] FILE ...\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 " FILE ...\n" -- "Trivial file listing program for portably checking rsync\n"); -- return 1; -- } -+ poptContext pc; -+ const char **extra_args; -+ int opt; - -- for (argv++; *argv; argv++) { -- list_file(*argv); -+ 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); -+ } - } - -+ 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 +@@ -190,6 +200,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 @@ -120,7 +120,7 @@ NORETURN void overflow_exit(const char *