X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/85a65b825893593b6685064f30c83b57b496afc9..048d2a08adf5b8d8e066ab6c0c8be30ccfb1c0e3:/atimes.diff diff --git a/atimes.diff b/atimes.diff index 721af1a..59b49a2 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 -@@ -62,6 +62,8 @@ void setup_protocol(int f_out,int f_in) +@@ -64,6 +64,8 @@ void setup_protocol(int f_out,int f_in) preserve_uid = ++file_extra_cnt; if (preserve_gid) preserve_gid = ++file_extra_cnt; @@ -16,10 +17,10 @@ To use this patch, run these commands for a successful build: + preserve_atimes = ++file_extra_cnt; if (preserve_acls && !am_sender) preserve_acls = ++file_extra_cnt; - + if (preserve_xattrs) --- old/flist.c +++ new/flist.c -@@ -48,6 +48,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; -@@ -143,6 +144,7 @@ void show_flist_stats(void) +@@ -148,6 +149,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)) { -@@ -157,14 +159,16 @@ static void list_file_entry(struct file_ +@@ -162,14 +164,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)); } } -@@ -348,6 +352,7 @@ int push_flist_dir(const char *dir, int +@@ -353,6 +357,7 @@ int push_flist_dir(const char *dir, int 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; -@@ -415,6 +420,13 @@ static void send_file_entry(int f, struc +@@ -420,6 +425,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) { -@@ -482,6 +494,8 @@ static void send_file_entry(int f, struc - write_int(f, modtime); +@@ -491,6 +503,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)) { - write_abbrevint30(f, uid); - if (flags & XMIT_USER_NAME_FOLLOWS) { -@@ -558,7 +572,7 @@ static void send_file_entry(int f, struc + if (protocol_version < 30) + write_int(f, uid); +@@ -577,7 +591,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; -@@ -655,6 +669,8 @@ static struct file_struct *recv_file_ent - modtime = (time_t)read_int(f); +@@ -686,6 +700,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); -@@ -769,6 +785,8 @@ static struct file_struct *recv_file_ent +@@ -810,6 +834,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; ++ F_ATIME(file) = (time_t)atime; if (basename != thisname) { file->dirname = lastdir; -@@ -1074,6 +1092,8 @@ struct file_struct *make_file(const char +@@ -1119,6 +1145,8 @@ struct file_struct *make_file(const char F_OWNER(file) = st.st_uid; if (preserve_gid) F_GROUP(file) = st.st_gid; @@ -123,7 +132,7 @@ To use this patch, run these commands for a successful build: file->dirname = lastdir; --- old/generator.c +++ new/generator.c -@@ -44,6 +44,7 @@ extern int preserve_perms; +@@ -45,6 +45,7 @@ extern int preserve_perms; extern int preserve_uid; extern int preserve_gid; extern int preserve_times; @@ -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; -@@ -552,6 +553,9 @@ void itemize(const char *fname, struct f +@@ -561,6 +562,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,7 +150,7 @@ 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) -@@ -852,6 +856,8 @@ static int try_dests_reg(struct file_str +@@ -878,6 +882,8 @@ static int try_dests_reg(struct file_str if (link_dest) { if (!hard_link_one(file, fname, cmpbuf, 1)) goto try_a_copy; @@ -150,7 +159,7 @@ To use this patch, run these commands for a successful build: 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)) { -@@ -1700,7 +1706,7 @@ static void touch_up_dirs(struct file_li +@@ -1741,7 +1747,7 @@ static void touch_up_dirs(struct file_li if (!(file->mode & S_IWUSR)) do_chmod(fname, file->mode); if (need_retouch_dir_times) @@ -181,7 +190,7 @@ To use this patch, run these commands for a successful build: c[11] = '\0'; --- old/options.c +++ new/options.c -@@ -55,6 +55,7 @@ int preserve_uid = 0; +@@ -56,6 +56,7 @@ int preserve_uid = 0; int preserve_gid = 0; int preserve_times = 0; int omit_dir_times = 0; @@ -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; -@@ -315,8 +316,9 @@ void usage(enum logcode F) +@@ -323,8 +324,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"); @@ -201,7 +210,7 @@ To use this patch, run these commands for a successful build: 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"); -@@ -436,6 +438,9 @@ static struct poptOption long_options[] +@@ -451,6 +453,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 }, -@@ -1577,6 +1582,8 @@ void server_options(char **args,int *arg +@@ -1603,6 +1608,8 @@ void server_options(char **args,int *arg argstr[x++] = 'D'; if (preserve_times) argstr[x++] = 't'; @@ -222,15 +231,15 @@ To use this patch, run these commands for a successful build: else if (preserve_executability && am_sender) --- old/rsync.c +++ new/rsync.c -@@ -34,6 +34,7 @@ extern int dry_run; - extern int preserve_acls; +@@ -35,6 +35,7 @@ extern int preserve_acls; + extern int preserve_xattrs; extern int preserve_perms; extern int preserve_executability; +extern int preserve_atimes; extern int preserve_times; extern int omit_dir_times; extern int am_root; -@@ -234,6 +235,7 @@ int set_file_attrs(char *fname, struct f +@@ -224,6 +225,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) { -@@ -261,18 +263,36 @@ int set_file_attrs(char *fname, struct f - get_acl(fname, sxp); +@@ -259,18 +261,36 @@ int set_file_attrs(const char *fname, st + set_xattr(fname, file, fnamecmp, sxp); #endif + /* This code must be the first update in the function due to @@ -281,10 +290,10 @@ To use this patch, run these commands for a successful build: --- old/rsync.h +++ new/rsync.h @@ -56,6 +56,7 @@ - #define XMIT_RDEV_MINOR_IS_SMALL (1<<11) - #define XMIT_USER_NAME_FOLLOWS (1<<12) /* protocols >= 30 */ - #define XMIT_GROUP_NAME_FOLLOWS (1<<13) /* protocols >= 30 */ -+#define XMIT_SAME_ATIME (1<<14) /* protocols >= 30 */ + #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_SAME_ATIME (1<<13) /* protocols ?? - NOW */ /* These flags are used in the live flist data. */ @@ -296,25 +305,25 @@ To use this patch, run these commands for a successful build: #define FULL_FLUSH 1 #define NORMAL_FLUSH 0 -@@ -571,6 +573,7 @@ extern int file_extra_cnt; +@@ -568,6 +570,7 @@ struct file_struct { + extern int file_extra_cnt; extern int preserve_uid; extern int preserve_gid; - extern int preserve_acls; +extern int preserve_atimes; + extern int preserve_acls; + extern int preserve_xattrs; - #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename)) - #define EXTRA_LEN (sizeof (union file_extras)) -@@ -603,6 +606,7 @@ extern int preserve_acls; +@@ -602,6 +605,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)->unum + #define F_ACL(f) REQ_EXTRA(f, preserve_acls)->num + #define F_XATTR(f) REQ_EXTRA(f, preserve_xattrs)->num - /* These items are per-entry optional and mutally exclusive: */ --- old/rsync.yo +++ new/rsync.yo -@@ -329,8 +329,9 @@ to the detailed description below for a +@@ -330,8 +330,9 @@ to the detailed description below for a --devices preserve device files (super-user only) --specials preserve special files -D same as --devices --specials @@ -326,7 +335,7 @@ To use this patch, run these commands for a successful build: --super receiver attempts super-user activities -S, --sparse handle sparse files efficiently -n, --dry-run show what would have been transferred -@@ -896,6 +897,12 @@ it is preserving modification times (see +@@ -908,6 +909,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 -@@ -1482,7 +1489,7 @@ quote(itemization( +@@ -1494,7 +1501,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 -@@ -1491,8 +1498,10 @@ quote(itemization( +@@ -1503,8 +1510,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). @@ -363,7 +372,7 @@ To use this patch, run these commands for a successful build: (a feature that is not yet released). --- old/sender.c +++ new/sender.c -@@ -41,6 +41,7 @@ extern int do_progress; +@@ -43,6 +43,7 @@ extern int do_progress; extern int inplace; extern int batch_fd; extern int write_batch;