X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/58b399b9a42eacea1953e68f527f79903bb39546..30c5d6b495835803d6f139e62b9e6e02b18e89c3:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index d19782c..e032fa2 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
-@@ -94,6 +94,8 @@ void setup_protocol(int f_out,int f_in)
+@@ -95,6 +95,8 @@ void setup_protocol(int f_out,int f_in)
  		preserve_uid = ++file_extra_cnt;
  	if (preserve_gid)
  		preserve_gid = ++file_extra_cnt;
@@ -20,7 +20,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  	if (preserve_xattrs)
 --- old/flist.c
 +++ new/flist.c
-@@ -51,6 +51,7 @@ extern int preserve_devices;
+@@ -52,6 +52,7 @@ extern int preserve_devices;
  extern int preserve_specials;
  extern int preserve_uid;
  extern int preserve_gid;
@@ -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;
-@@ -154,6 +155,7 @@ void show_flist_stats(void)
+@@ -158,6 +159,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)) {
-@@ -168,14 +170,16 @@ static void list_file_entry(struct file_
+@@ -172,14 +174,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));
  	}
  }
-@@ -339,6 +343,7 @@ int push_pathname(const char *dir, int l
+@@ -338,6 +342,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;
-@@ -434,6 +439,13 @@ static void send_file_entry(int f, struc
+@@ -433,6 +438,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) {
-@@ -505,6 +517,8 @@ static void send_file_entry(int f, struc
+@@ -504,6 +516,8 @@ static void send_file_entry(int f, struc
  	}
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -86,18 +86,18 @@ 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);
-@@ -591,7 +605,7 @@ static void send_file_entry(int f, struc
+@@ -590,7 +604,7 @@ static void send_file_entry(int f, struc
  static struct file_struct *recv_file_entry(struct file_list *flist,
- 					   int flags, int f)
+ 					   int xflags, int f)
  {
 -	static int64 modtime;
 +	static int64 modtime, atime;
  	static mode_t mode;
  	static int64 dev;
  	static dev_t rdev;
-@@ -725,6 +739,16 @@ static struct file_struct *recv_file_ent
+@@ -726,6 +740,16 @@ static struct file_struct *recv_file_ent
  	}
- 	if (!(flags & XMIT_SAME_MODE))
+ 	if (!(xflags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
 +	if (preserve_atimes && !S_ISDIR(mode) && !(flags & XMIT_SAME_ATIME)) {
 +		atime = read_varlong(f, 4);
@@ -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);
-@@ -850,6 +874,8 @@ static struct file_struct *recv_file_ent
- 		F_OWNER(file) = uid;
- 	if (preserve_gid)
+@@ -854,6 +878,8 @@ static struct file_struct *recv_file_ent
  		F_GROUP(file) = gid;
+ 		file->flags |= gid_flags;
+ 	}
 +	if (preserve_atimes)
 +		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
+@@ -1173,6 +1199,8 @@ struct file_struct *make_file(const char
  		F_OWNER(file) = st.st_uid;
  	if (preserve_gid)
  		F_GROUP(file) = st.st_gid;
@@ -149,7 +149,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
 +			iflags |= ITEM_REPORT_ATIME;
  		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)
+ 		if (preserve_uid && am_root && (uid_t)F_OWNER(file) != sxp->st.st_uid)
 @@ -880,6 +884,8 @@ static int try_dests_reg(struct file_str
  		if (link_dest) {
  			if (!hard_link_one(file, fname, cmpbuf, 1))
@@ -159,15 +159,15 @@ 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)) {
-@@ -1743,7 +1749,7 @@ static void touch_up_dirs(struct file_li
+@@ -1749,7 +1755,7 @@ static void touch_up_dirs(struct file_li
  		if (!(file->mode & S_IWUSR))
  			do_chmod(fname, file->mode);
  		if (need_retouch_dir_times)
 -			set_modtime(fname, file->modtime, file->mode);
 +			set_times(fname, file->modtime, file->modtime, file->mode);
- 		if (allowed_lull && !(++j % lull_mod))
+ 		if (allowed_lull && !(counter % lull_mod))
  			maybe_send_keepalive();
- 		else if (!(j % 200))
+ 		else if (!(counter & 0xFF))
 --- old/log.c
 +++ new/log.c
 @@ -34,6 +34,7 @@ extern int msg_fd_out;
@@ -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;
-@@ -334,8 +335,9 @@ void usage(enum logcode F)
+@@ -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");
    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");
-@@ -468,6 +470,9 @@ static struct poptOption long_options[] 
+@@ -471,6 +473,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 },
-@@ -1652,6 +1657,8 @@ void server_options(char **args,int *arg
+@@ -1668,6 +1673,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -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;
-@@ -271,6 +272,7 @@ int set_file_attrs(const char *fname, st
+@@ -275,6 +276,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) {
-@@ -308,18 +310,36 @@ int set_file_attrs(const char *fname, st
+@@ -312,18 +314,36 @@ int set_file_attrs(const char *fname, st
  		set_stat_xattr(fname, file);
  #endif
  
@@ -286,7 +286,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
 +			updated = 0;
  	}
  
- 	change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
+ 	change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file);
 --- old/rsync.h
 +++ new/rsync.h
 @@ -56,6 +56,7 @@
@@ -297,7 +297,7 @@ TODO:  need to fix this to handle 64-bit time_t values!
  
  /* These flags are used in the live flist data. */
  
-@@ -141,6 +142,7 @@
+@@ -143,6 +144,7 @@
  
  #define ATTRS_REPORT		(1<<0)
  #define ATTRS_SKIP_MTIME	(1<<1)
@@ -323,7 +323,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
-@@ -330,8 +330,9 @@ to the detailed description below for a 
+@@ -336,8 +336,9 @@ to the detailed description below for a 
       --devices               preserve device files (super-user only)
       --specials              preserve special files
   -D                          same as --devices --specials
@@ -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
-@@ -910,6 +911,12 @@ it is preserving modification times (see
+@@ -916,6 +917,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
-@@ -1524,7 +1531,7 @@ quote(itemization(
+@@ -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)
@@ -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
-@@ -1533,8 +1540,10 @@ quote(itemization(
+@@ -1539,8 +1546,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).