X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/13bed3ddd0403dc8941696ca63d3e17a1d8676c3..cad12f627670106269929565f075db42ca2e06c0:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index cc20796..a023be9 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- orig/batch.c	2004-05-15 20:10:13
+--- orig/batch.c	2004-08-02 05:02:24
 +++ batch.c	2004-07-03 20:15:41
-@@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
+@@ -184,6 +184,8 @@ void show_flist(int index, struct file_s
  		rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
  		rprintf(FINFO, "flist->modtime=%#lx\n",
  			(long unsigned) fptr[i]->modtime);
@@ -15,9 +15,9 @@ command before "make":
  		rprintf(FINFO, "flist->length=%.0f\n",
  			(double) fptr[i]->length);
  		rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- orig/flist.c	2004-06-18 16:23:07
+--- orig/flist.c	2004-09-21 09:40:27
 +++ flist.c	2004-07-03 20:15:41
-@@ -58,6 +58,7 @@ extern int relative_paths;
+@@ -59,6 +59,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
@@ -25,7 +25,7 @@ command before "make":
  extern int protocol_version;
  extern int sanitize_paths;
  extern int delete_excluded;
-@@ -144,17 +145,17 @@ static void list_file_entry(struct file_
+@@ -143,17 +144,17 @@ static void list_file_entry(struct file_
  
  #if SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
@@ -47,7 +47,7 @@ command before "make":
  	}
  }
  
-@@ -335,6 +336,7 @@ void send_file_entry(struct file_struct 
+@@ -334,6 +335,7 @@ void send_file_entry(struct file_struct 
  {
  	unsigned short flags;
  	static time_t modtime;
@@ -55,7 +55,7 @@ command before "make":
  	static mode_t mode;
  	static uint64 dev;
  	static dev_t rdev;
-@@ -350,7 +352,7 @@ void send_file_entry(struct file_struct 
+@@ -349,7 +351,7 @@ void send_file_entry(struct file_struct 
  
  	if (!file) {
  		write_byte(f, 0);
@@ -64,7 +64,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -399,6 +401,12 @@ void send_file_entry(struct file_struct 
+@@ -398,6 +400,12 @@ void send_file_entry(struct file_struct 
  		flags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
@@ -77,7 +77,7 @@ command before "make":
  
  #if SUPPORT_HARD_LINKS
  	if (file->link_u.idev) {
-@@ -454,6 +462,8 @@ void send_file_entry(struct file_struct 
+@@ -453,6 +461,8 @@ void send_file_entry(struct file_struct 
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -86,7 +86,7 @@ command before "make":
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		if (!numeric_ids)
  			add_uid(uid);
-@@ -527,6 +537,7 @@ void receive_file_entry(struct file_stru
+@@ -526,6 +536,7 @@ void receive_file_entry(struct file_stru
  			struct file_list *flist, int f)
  {
  	static time_t modtime;
@@ -94,7 +94,7 @@ command before "make":
  	static mode_t mode;
  	static uint64 dev;
  	static dev_t rdev;
-@@ -543,7 +554,7 @@ void receive_file_entry(struct file_stru
+@@ -542,7 +553,7 @@ void receive_file_entry(struct file_stru
  	struct file_struct *file;
  
  	if (!fptr) {
@@ -103,7 +103,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -598,6 +609,8 @@ void receive_file_entry(struct file_stru
+@@ -597,6 +608,8 @@ void receive_file_entry(struct file_stru
  		modtime = (time_t)read_int(f);
  	if (!(flags & XMIT_SAME_MODE))
  		mode = from_wire_mode(read_int(f));
@@ -112,7 +112,7 @@ command before "make":
  
  	if (preserve_uid && !(flags & XMIT_SAME_UID))
  		uid = (uid_t)read_int(f);
-@@ -648,6 +661,7 @@ void receive_file_entry(struct file_stru
+@@ -647,6 +660,7 @@ void receive_file_entry(struct file_stru
  
  	file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
  	file->modtime = modtime;
@@ -120,7 +120,7 @@ command before "make":
  	file->length = file_length;
  	file->mode = mode;
  	file->uid = uid;
-@@ -867,6 +881,7 @@ skip_excludes:
+@@ -868,6 +882,7 @@ skip_excludes:
  
  	file->flags = flags;
  	file->modtime = st.st_mtime;
@@ -128,9 +128,9 @@ command before "make":
  	file->length = st.st_size;
  	file->mode = st.st_mode;
  	file->uid = st.st_uid;
---- orig/generator.c	2004-06-30 07:24:45
+--- orig/generator.c	2004-09-20 19:50:13
 +++ generator.c	2004-07-03 20:15:41
-@@ -99,7 +99,7 @@ static int skip_file(char *fname, struct
+@@ -92,7 +92,7 @@ static int skip_file(char *fname, struct
  	if (ignore_times)
  		return 0;
  
@@ -146,9 +146,9 @@ command before "make":
 -	    && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 +	    && cmp_time(st.st_mtime, file->modtime) > 0) {
  		if (verbose > 1)
- 			rprintf(FINFO,"%s is newer\n",fname);
+ 			rprintf(FINFO, "%s is newer\n", safe_fname(fname));
  		return;
---- orig/options.c	2004-06-20 19:30:00
+--- orig/options.c	2004-09-20 05:10:48
 +++ options.c	2004-07-03 20:15:41
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
@@ -158,7 +158,7 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -245,6 +246,7 @@ void usage(enum logcode F)
+@@ -253,6 +254,7 @@ void usage(enum logcode F)
    rprintf(F," -g, --group                 preserve group\n");
    rprintf(F," -D, --devices               preserve devices (root only)\n");
    rprintf(F," -t, --times                 preserve times\n");
@@ -166,7 +166,7 @@ command before "make":
    rprintf(F," -S, --sparse                handle sparse files efficiently\n");
    rprintf(F," -n, --dry-run               show what would have been transferred\n");
    rprintf(F," -W, --whole-file            copy whole files, no incremental checks\n");
-@@ -352,6 +354,7 @@ static struct poptOption long_options[] 
+@@ -362,6 +364,7 @@ static struct poptOption long_options[] 
    {"group",           'g', POPT_ARG_NONE,   &preserve_gid, 0, 0, 0 },
    {"devices",         'D', POPT_ARG_NONE,   &preserve_devices, 0, 0, 0 },
    {"times",           't', POPT_ARG_NONE,   &preserve_times, 0, 0, 0 },
@@ -174,7 +174,7 @@ command before "make":
    {"checksum",        'c', POPT_ARG_NONE,   &always_checksum, 0, 0, 0 },
    {"verbose",         'v', POPT_ARG_NONE,   0,               'v', 0, 0 },
    {"quiet",           'q', POPT_ARG_NONE,   0,               'q', 0, 0 },
-@@ -841,6 +844,8 @@ void server_options(char **args,int *arg
+@@ -946,6 +949,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -183,8 +183,8 @@ command before "make":
  	if (preserve_perms)
  		argstr[x++] = 'p';
  	if (recurse)
---- orig/rsync.c	2004-07-02 18:06:32
-+++ rsync.c	2004-07-03 20:15:41
+--- orig/rsync.c	2004-09-07 21:45:30
++++ rsync.c	2004-08-13 08:17:28
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -193,7 +193,7 @@ command before "make":
  extern int am_root;
  extern int am_sender;
  extern int am_generator;
-@@ -143,17 +144,31 @@ int set_perms(char *fname,struct file_st
+@@ -145,17 +146,32 @@ int set_perms(char *fname,struct file_st
  	if (!preserve_times || S_ISLNK(st->st_mode)
  	    || (make_backups && !backup_dir && S_ISDIR(st->st_mode)))
  		flags |= PERMS_SKIP_MTIME;
@@ -201,7 +201,8 @@ command before "make":
 -	    && cmp_modtime(st->st_mtime, file->modtime) != 0) {
 +	if (!copy_atimes || S_ISLNK(st->st_mode) || S_ISDIR(st->st_mode))
 +		flags |= PERMS_SKIP_ATIME;
-+	if (!(flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))) {
++	if ((flags & (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME))
++	    != (PERMS_SKIP_MTIME|PERMS_SKIP_ATIME)) {
 +		time_t atime, mtime;
 +
 +		if (!(flags & PERMS_SKIP_ATIME)
@@ -229,7 +230,7 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h	2004-05-16 07:58:12
+--- orig/rsync.h	2004-08-03 15:41:32
 +++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -247,7 +248,7 @@ command before "make":
  
  #define FULL_FLUSH	1
  #define NORMAL_FLUSH	0
-@@ -422,6 +424,7 @@ struct file_struct {
+@@ -425,6 +427,7 @@ struct file_struct {
  		struct hlink *links;
  	} link_u;
  	time_t modtime;
@@ -255,9 +256,9 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- orig/rsync.yo	2004-06-17 06:32:00
+--- orig/rsync.yo	2004-09-20 05:10:48
 +++ rsync.yo	2004-07-03 20:15:41
-@@ -300,6 +300,7 @@ verb(
+@@ -330,6 +330,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
@@ -265,9 +266,9 @@ command before "make":
   -S, --sparse                handle sparse files efficiently
   -n, --dry-run               show what would have been transferred
   -W, --whole-file            copy whole files, no incremental checks
-@@ -552,6 +553,11 @@ cause the next transfer to behave as if 
- their checksums compared and show up in log messages even if they haven't
- changed.
+@@ -603,6 +604,11 @@ cause the next transfer to behave as if 
+ updated (though the rsync algorithm will make the update fairly efficient
+ if the files haven't actually changed, you're much better off using -t).
  
 +dit(bf(-A, --copy-atimes)) This tells rsync to transfer access times
 +along with the files and update them on the remote system.  Note that
@@ -299,7 +300,7 @@ command before "make":
 +
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
---- orig/testsuite/rsync.fns	2004-06-28 21:08:14
+--- orig/testsuite/rsync.fns	2004-09-18 01:49:34
 +++ testsuite/rsync.fns	2004-07-03 20:15:41
 @@ -50,7 +50,7 @@ printmsg() {
  
@@ -310,7 +311,7 @@ command before "make":
  }
  
  rsync_getgroups() { 
-@@ -150,6 +150,8 @@ checkit() {
+@@ -158,6 +158,8 @@ checkit() {
      # We can just write everything to stdout/stderr, because the
      # wrapper hides it unless there is a problem.
  
@@ -319,7 +320,7 @@ command before "make":
      echo "Running: \"$1\""  
      eval "$1" 
      status=$?
-@@ -158,6 +160,12 @@ checkit() {
+@@ -166,6 +168,12 @@ checkit() {
      fi
  
      echo "-------------"
@@ -332,7 +333,7 @@ command before "make":
      echo "check how the files compare with diff:"
      echo ""
      for f in `cd "$2"; find . -type f -print `
-@@ -165,12 +173,6 @@ checkit() {
+@@ -173,12 +181,6 @@ checkit() {
          diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
      done
  
@@ -482,9 +483,9 @@ command before "make":
  
  	return 0;
  }
---- orig/util.c	2004-06-09 21:54:47
+--- orig/util.c	2004-09-07 21:45:30
 +++ util.c	2004-07-03 20:15:41
-@@ -127,31 +127,39 @@ void overflow(char *str)
+@@ -128,31 +128,39 @@ void overflow(char *str)
  
  
  
@@ -530,7 +531,7 @@ command before "make":
  		t[0].tv_usec = 0;
  		t[1].tv_sec = modtime;
  		t[1].tv_usec = 0;
-@@ -1078,8 +1086,8 @@ int msleep(int t)
+@@ -1142,8 +1150,8 @@ int msleep(int t)
  
  
  /**
@@ -541,7 +542,7 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
-@@ -1088,7 +1096,7 @@ int msleep(int t)
+@@ -1152,7 +1160,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/