X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/97669ae93535a5d9eb1bac85f0c0b7c6a09ca8c2..9405aad35af07ff87dd3b37d3da51f71982b05fe:/atimes.diff diff --git a/atimes.diff b/atimes.diff index dae2530..d19782c 100644 --- a/atimes.diff +++ b/atimes.diff @@ -28,7 +28,7 @@ TODO: need to fix this to handle 64-bit time_t values! extern int relative_paths; extern int implied_dirs; extern int file_extra_cnt; -@@ -148,6 +149,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]; @@ -36,7 +36,7 @@ TODO: need to fix this to handle 64-bit time_t values! double len; if (!F_IS_ACTIVE(f)) { -@@ -162,14 +164,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)) { @@ -55,7 +55,7 @@ TODO: need to fix this to handle 64-bit time_t values! f_name(f, NULL)); } } -@@ -333,6 +337,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; @@ -63,7 +63,7 @@ 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 +@@ -434,6 +439,13 @@ static void send_file_entry(int f, struc flags |= XMIT_SAME_TIME; else modtime = file->modtime; @@ -77,7 +77,7 @@ TODO: need to fix this to handle 64-bit time_t values! #ifdef SUPPORT_HARD_LINKS if (tmp_dev != 0) { -@@ -471,6 +483,8 @@ static void send_file_entry(int f, struc +@@ -505,6 +517,8 @@ static void send_file_entry(int f, struc } if (!(flags & XMIT_SAME_MODE)) write_int(f, to_wire_mode(mode)); @@ -86,7 +86,7 @@ TODO: need to fix this to handle 64-bit time_t values! if (preserve_uid && !(flags & XMIT_SAME_UID)) { if (protocol_version < 30) write_int(f, uid); -@@ -557,7 +571,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) { @@ -95,7 +95,7 @@ TODO: need to fix this to handle 64-bit time_t values! static mode_t mode; static int64 dev; static dev_t rdev; -@@ -666,6 +680,16 @@ static struct file_struct *recv_file_ent +@@ -725,6 +739,16 @@ static struct file_struct *recv_file_ent } if (!(flags & XMIT_SAME_MODE)) mode = from_wire_mode(read_int(f)); @@ -112,16 +112,16 @@ 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 +@@ -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) = (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->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; @@ -140,7 +140,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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; @@ -150,7 +150,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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; @@ -159,7 +159,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)) { -@@ -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) @@ -170,7 +170,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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; @@ -178,7 +178,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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'; @@ -198,7 +198,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; -@@ -325,8 +326,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"); @@ -210,7 +210,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"); -@@ -456,6 +458,9 @@ static struct poptOption long_options[] +@@ -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 }, @@ -220,7 +220,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 +@@ -1652,6 +1657,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -231,7 +231,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 +239,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 +@@ -271,6 +272,7 @@ int set_file_attrs(const char *fname, st int updated = 0; statx sx2; int change_uid, change_gid; @@ -247,7 +247,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 +@@ -308,18 +310,36 @@ int set_file_attrs(const char *fname, st set_stat_xattr(fname, file); #endif @@ -305,7 +305,7 @@ 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 { +@@ -582,6 +584,7 @@ struct file_struct { extern int file_extra_cnt; extern int preserve_uid; extern int preserve_gid; @@ -313,14 +313,14 @@ TODO: need to fix this to handle 64-bit time_t values! extern int preserve_acls; extern int preserve_xattrs; -@@ -607,6 +610,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 @@ -335,7 +335,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 -@@ -909,6 +910,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). @@ -348,7 +348,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( +@@ -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) @@ -357,7 +357,7 @@ TODO: need to fix this to handle 64-bit time_t values! 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( +@@ -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). @@ -404,7 +404,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 +415,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 +432,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; - } +@@ -98,6 +98,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 +@@ -105,12 +107,29 @@ static void failed(char const *what, cha exit(1); } @@ -473,7 +473,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) +@@ -147,19 +166,8 @@ static void list_file(const char *fname) permstring(permbuf, buf.st_mode); @@ -495,7 +495,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) +@@ -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); @@ -510,17 +510,17 @@ 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 +@@ -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"); - 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 *