X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/7c15d5aa2fa65886f0130e5350cd2021283b5fda..a302c04819c87d365481d9a8b516d3c20df8bf46:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 5c32110..b49ccc8 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -6,16 +6,27 @@ To use this patch, run these commands for a successful build:
     make
 
 
+--- old/compat.c
++++ new/compat.c
+@@ -50,6 +50,8 @@ void setup_protocol(int f_out,int f_in)
+ 		preserve_uid = ++file_extra_cnt;
+ 	if (preserve_gid)
+ 		preserve_gid = ++file_extra_cnt;
++	if (preserve_atimes)
++		preserve_atimes = ++file_extra_cnt;
+ 
+ 	if (remote_protocol == 0) {
+ 		if (!read_batch)
 --- old/flist.c
 +++ new/flist.c
-@@ -46,6 +46,7 @@ extern int preserve_devices;
+@@ -47,6 +47,7 @@ extern int preserve_devices;
  extern int preserve_specials;
  extern int preserve_uid;
  extern int preserve_gid;
 +extern int preserve_atimes;
  extern int relative_paths;
  extern int implied_dirs;
- extern int flist_extra_cnt;
+ extern int file_extra_cnt;
 @@ -137,6 +138,7 @@ void show_flist_stats(void)
  static void list_file_entry(struct file_struct *f)
  {
@@ -43,9 +54,9 @@ To use this patch, run these commands for a successful build:
  			f_name(f, NULL));
  	}
  }
-@@ -314,6 +318,7 @@ static void send_file_entry(struct file_
+@@ -313,6 +317,7 @@ void flist_expand(struct file_list *flis
+ static void send_file_entry(struct file_struct *file, int f, int ndx)
  {
- 	unsigned short flags;
  	static time_t modtime;
 +	static time_t atime;
  	static mode_t mode;
@@ -64,7 +75,7 @@ To use this patch, run these commands for a successful build:
 +	}
  
  #ifdef SUPPORT_HARD_LINKS
- 	if (tmp_idev.dev != 0) {
+ 	if (tmp_dev != 0) {
 @@ -434,6 +446,8 @@ static void send_file_entry(struct file_
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
@@ -76,7 +87,7 @@ To use this patch, run these commands for a successful build:
  			add_uid(uid);
 @@ -501,7 +515,7 @@ static void send_file_entry(struct file_
  static struct file_struct *recv_file_entry(struct file_list *flist,
- 					   unsigned short flags, int f)
+ 					   int flags, int f)
  {
 -	static time_t modtime;
 +	static time_t modtime, atime;
@@ -101,7 +112,7 @@ To use this patch, run these commands for a successful build:
  
  	if (chmod_modes && !S_ISLNK(mode))
  		mode = tweak_mode(mode, chmod_modes);
-@@ -695,6 +711,8 @@ static struct file_struct *recv_file_ent
+@@ -700,6 +716,8 @@ static struct file_struct *recv_file_ent
  		F_UID(file) = uid;
  	if (preserve_gid)
  		F_GID(file) = gid;
@@ -110,7 +121,7 @@ To use this patch, run these commands for a successful build:
  
  	if (dirname_len) {
  		file->dirname = lastdir = bp;
-@@ -985,6 +1003,8 @@ struct file_struct *make_file(const char
+@@ -1002,6 +1020,8 @@ struct file_struct *make_file(const char
  		F_UID(file) = st.st_uid;
  	if (preserve_gid)
  		F_GID(file) = st.st_gid;
@@ -178,7 +189,7 @@ To use this patch, run these commands for a successful build:
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -307,8 +308,9 @@ void usage(enum logcode F)
+@@ -306,8 +307,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");
@@ -190,7 +201,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");
-@@ -425,6 +427,9 @@ static struct poptOption long_options[] 
+@@ -424,6 +426,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 },
@@ -200,16 +211,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 },
-@@ -1223,6 +1228,8 @@ int parse_arguments(int *argc, const cha
- 		preserve_uid = ++flist_extra_cnt;
- 	if (preserve_gid)
- 		preserve_gid = ++flist_extra_cnt;
-+	if (preserve_atimes)
-+		preserve_atimes = ++flist_extra_cnt;
- 
- 	*argv = poptGetArgs(pc);
- 	*argc = count_args(*argv);
-@@ -1542,6 +1549,8 @@ void server_options(char **args,int *arg
+@@ -1536,6 +1541,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -294,22 +296,22 @@ To use this patch, run these commands for a successful build:
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -514,6 +516,7 @@ struct file_struct {
- 	union flist_extras {
- 		uid_t uid;           /* The user ID number */
- 		uid_t gid;           /* The group ID number or GID_NONE */
-+		time_t utime;        /* A unix-time value */
- 		struct idev *idev;   /* The hard-link info during matching */
- 		int32 num;           /* A signed number */
- 		uint32 unum;         /* An unsigned number */
-@@ -559,6 +562,7 @@ extern int preserve_gid;
+@@ -551,6 +553,7 @@ struct file_struct {
+ extern int file_extra_cnt;
+ extern int preserve_uid;
+ extern int preserve_gid;
++extern int preserve_atimes;
+ 
+ #define FILE_STRUCT_LEN (offsetof(struct file_struct, basename))
+ #define EXTRA_LEN (sizeof (union file_extras))
+@@ -583,6 +586,7 @@ extern int preserve_gid;
  /* When the associated option is on, all entries will have these present: */
- #define F_UID(f) REQ_EXTRA(f, preserve_uid)->uid
- #define F_GID(f) REQ_EXTRA(f, preserve_gid)->gid
-+#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->utime
+ #define F_UID(f) REQ_EXTRA(f, preserve_uid)->unum
+ #define F_GID(f) REQ_EXTRA(f, preserve_gid)->unum
++#define F_ATIME(f) REQ_EXTRA(f, preserve_atimes)->unum
  
  /* These items are per-entry optional and mutally exclusive: */
- #define F_HL_IDEV(f) OPT_EXTRA(f, LEN64_BUMP(f))->idev
+ #define F_HL_GNUM(f) OPT_EXTRA(f, LEN64_BUMP(f))->num
 --- old/rsync.yo
 +++ new/rsync.yo
 @@ -328,8 +328,9 @@ to the detailed description below for a 
@@ -530,7 +532,7 @@ To use this patch, run these commands for a successful build:
 +
 +static void tls_usage(int ret)
 +{
-+	fprintf(stderr, "usage: " PROGRAM " [--atime | -u] DIR ...\n"
++	fprintf(stderr, "usage: " PROGRAM " [--atime | -u] FILE ...\n"
 +	    "Trivial file listing program for portably checking rsync\n");
 +	exit(ret);
  }
@@ -539,7 +541,7 @@ To use this patch, run these commands for a successful build:
  main(int argc, char *argv[])
  {
 -	if (argc < 2) {
--		fprintf(stderr, "usage: " PROGRAM " DIR ...\n"
+-		fprintf(stderr, "usage: " PROGRAM " FILE ...\n"
 -			"Trivial file listing program for portably checking rsync\n");
 -		return 1;
 -	}