X-Git-Url: https://mattmccutchen.net/rsync/rsync-patches.git/blobdiff_plain/fe6407b5a9f04c88f74ea95e959aaa38334e41a6..982426b8a364eae49577cb0906e84f0ff83499dc:/atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 18803a8..db78a51 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -4,9 +4,9 @@ command before "make":
     make proto
 
 
---- batch.c	15 May 2004 19:31:10 -0000	1.32
-+++ batch.c	15 May 2004 20:13:11 -0000
-@@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
+--- orig/batch.c	2004-07-24 16:52:09
++++ batch.c	2004-07-03 20:15:41
+@@ -186,6 +186,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,38 +15,39 @@ command before "make":
  		rprintf(FINFO, "flist->length=%.0f\n",
  			(double) fptr[i]->length);
  		rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
---- flist.c	15 May 2004 19:31:10 -0000	1.223
-+++ flist.c	15 May 2004 20:13:11 -0000
-@@ -57,6 +57,7 @@ extern int relative_paths;
+--- orig/flist.c	2004-07-17 15:20:05
++++ flist.c	2004-07-03 20:15:41
+@@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
  extern int copy_unsafe_links;
 +extern int copy_atimes;
  extern int protocol_version;
  extern int sanitize_paths;
- 
-@@ -139,16 +140,16 @@ static void list_file_entry(struct file_
+ extern int delete_excluded;
+@@ -141,17 +142,17 @@ static void list_file_entry(struct file_
  
  #if SUPPORT_LINKS
  	if (preserve_links && S_ISLNK(f->mode)) {
 -		rprintf(FINFO, "%s %11.0f %s %s -> %s\n",
 +		rprintf(FINFO, "%s %11.0f %s %s %s -> %s\n",
  			perms,
- 			(double) f->length, timestring(f->modtime),
+ 			(double)f->length, timestring(f->modtime),
 -			f_name(f), f->u.link);
 +			timestring(f->atime), f_name(f), f->u.link);
  	} else
  #endif
+ 	{
 -		rprintf(FINFO, "%s %11.0f %s %s\n",
 +		rprintf(FINFO, "%s %11.0f %s %s %s\n",
  			perms,
- 			(double) f->length, timestring(f->modtime),
+ 			(double)f->length, timestring(f->modtime),
 -			f_name(f));
 +			timestring(f->atime), f_name(f));
+ 	}
  }
  
- 
-@@ -325,6 +326,7 @@ void send_file_entry(struct file_struct 
+@@ -332,6 +333,7 @@ void send_file_entry(struct file_struct 
  {
  	unsigned short flags;
  	static time_t modtime;
@@ -54,7 +55,7 @@ command before "make":
  	static mode_t mode;
  	static uint64 dev;
  	static dev_t rdev;
-@@ -340,7 +342,7 @@ void send_file_entry(struct file_struct 
+@@ -347,7 +349,7 @@ void send_file_entry(struct file_struct 
  
  	if (!file) {
  		write_byte(f, 0);
@@ -63,7 +64,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -389,6 +391,12 @@ void send_file_entry(struct file_struct 
+@@ -396,6 +398,12 @@ void send_file_entry(struct file_struct 
  		flags |= XMIT_SAME_TIME;
  	else
  		modtime = file->modtime;
@@ -76,7 +77,7 @@ command before "make":
  
  #if SUPPORT_HARD_LINKS
  	if (file->link_u.idev) {
-@@ -444,6 +452,8 @@ void send_file_entry(struct file_struct 
+@@ -451,6 +459,8 @@ void send_file_entry(struct file_struct 
  		write_int(f, modtime);
  	if (!(flags & XMIT_SAME_MODE))
  		write_int(f, to_wire_mode(mode));
@@ -85,15 +86,15 @@ command before "make":
  	if (preserve_uid && !(flags & XMIT_SAME_UID)) {
  		if (!numeric_ids)
  			add_uid(uid);
-@@ -517,6 +527,7 @@ void receive_file_entry(struct file_stru
-     struct file_list *flist, int f)
+@@ -524,6 +534,7 @@ void receive_file_entry(struct file_stru
+ 			struct file_list *flist, int f)
  {
  	static time_t modtime;
 +	static time_t atime;
  	static mode_t mode;
  	static uint64 dev;
  	static dev_t rdev;
-@@ -533,7 +544,7 @@ void receive_file_entry(struct file_stru
+@@ -540,7 +551,7 @@ void receive_file_entry(struct file_stru
  	struct file_struct *file;
  
  	if (!fptr) {
@@ -102,7 +103,7 @@ command before "make":
  		dev = 0, rdev = makedev(0, 0);
  		rdev_major = 0;
  		uid = 0, gid = 0;
-@@ -588,6 +599,8 @@ void receive_file_entry(struct file_stru
+@@ -595,6 +606,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));
@@ -111,7 +112,7 @@ command before "make":
  
  	if (preserve_uid && !(flags & XMIT_SAME_UID))
  		uid = (uid_t)read_int(f);
-@@ -638,6 +651,7 @@ void receive_file_entry(struct file_stru
+@@ -645,6 +658,7 @@ void receive_file_entry(struct file_stru
  
  	file->flags = flags & XMIT_TOP_DIR ? FLAG_TOP_DIR : 0;
  	file->modtime = modtime;
@@ -119,7 +120,7 @@ command before "make":
  	file->length = file_length;
  	file->mode = mode;
  	file->uid = uid;
-@@ -852,6 +866,7 @@ skip_excludes:
+@@ -864,6 +878,7 @@ skip_excludes:
  
  	file->flags = flags;
  	file->modtime = st.st_mtime;
@@ -127,29 +128,29 @@ command before "make":
  	file->length = st.st_size;
  	file->mode = st.st_mode;
  	file->uid = st.st_uid;
---- generator.c	15 May 2004 19:31:10 -0000	1.83
-+++ generator.c	15 May 2004 20:13:11 -0000
+--- orig/generator.c	2004-07-28 10:05:29
++++ generator.c	2004-07-03 20:15:41
 @@ -98,7 +98,7 @@ static int skip_file(char *fname, struct
+ 	if (ignore_times)
  		return 0;
- 	}
  
--	return (cmp_modtime(st->st_mtime,file->modtime) == 0);
-+	return cmp_time(st->st_mtime,file->modtime) == 0;
+-	return cmp_modtime(st->st_mtime, file->modtime) == 0;
++	return cmp_time(st->st_mtime, file->modtime) == 0;
  }
  
  
-@@ -467,7 +467,7 @@ void recv_generator(char *fname, struct 
- 		return;
+@@ -473,7 +473,7 @@ static void recv_generator(char *fname, 
  	}
  
--	if (update_only && cmp_modtime(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
-+	if (update_only && cmp_time(st.st_mtime,file->modtime)>0 && fnamecmp == fname) {
+ 	if (update_only && fnamecmp == fname
+-	    && 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;
---- options.c	6 May 2004 21:08:01 -0000	1.148
-+++ options.c	15 May 2004 20:13:11 -0000
-@@ -46,6 +46,7 @@ int preserve_devices = 0;
+--- orig/options.c	2004-07-23 17:16:13
++++ options.c	2004-07-03 20:15:41
+@@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
  int preserve_times = 0;
@@ -157,7 +158,7 @@ command before "make":
  int update_only = 0;
  int cvs_exclude = 0;
  int dry_run = 0;
-@@ -241,6 +242,7 @@ void usage(enum logcode F)
+@@ -252,6 +253,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");
@@ -165,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");
-@@ -346,6 +348,7 @@ static struct poptOption long_options[] 
+@@ -360,6 +362,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 },
@@ -173,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 },
-@@ -823,6 +826,8 @@ void server_options(char **args,int *arg
+@@ -881,6 +884,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -182,8 +183,8 @@ command before "make":
  	if (preserve_perms)
  		argstr[x++] = 'p';
  	if (recurse)
---- rsync.c	15 May 2004 19:31:10 -0000	1.139
-+++ rsync.c	15 May 2004 20:13:12 -0000
+--- orig/rsync.c	2004-07-26 16:06:53
++++ rsync.c	2004-07-03 20:15:41
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -192,9 +193,9 @@ command before "make":
  extern int am_root;
  extern int am_sender;
  extern int am_generator;
-@@ -140,17 +141,31 @@ int set_perms(char *fname,struct file_st
- 
- 	if (!preserve_times || S_ISLNK(st->st_mode))
+@@ -144,17 +145,31 @@ 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;
 -	if (!(flags & PERMS_SKIP_MTIME)
 -	    && cmp_modtime(st->st_mtime, file->modtime) != 0) {
@@ -228,8 +229,8 @@ command before "make":
  	}
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- rsync.h	13 May 2004 18:51:22 -0000	1.203
-+++ rsync.h	15 May 2004 20:13:12 -0000
+--- orig/rsync.h	2004-07-23 17:16:13
++++ rsync.h	2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)
@@ -254,9 +255,9 @@ command before "make":
  	uid_t uid;
  	gid_t gid;
  	mode_t mode;
---- rsync.yo	7 May 2004 00:18:37 -0000	1.169
-+++ rsync.yo	15 May 2004 20:13:12 -0000
-@@ -299,6 +299,7 @@ verb(
+--- orig/rsync.yo	2004-07-24 16:52:10
++++ rsync.yo	2004-07-03 20:15:41
+@@ -301,6 +301,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
   -t, --times                 preserve times
@@ -264,20 +265,88 @@ 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
-@@ -545,6 +546,11 @@ modified cannot be effective; in other w
- cause the next transfer to behave as if it used -I, and all files will have
+@@ -567,6 +568,11 @@ cause the next transfer to behave as if 
  their checksums compared and show up in log messages even if they haven't
  changed.
-+
+ 
 +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
 +reading the source file may update the atime and hence repeated rsync
 +copies with --copy-atimes may copy files unnecessarily.
- 
++
  dit(bf(-n, --dry-run)) This tells rsync to not do any file transfers,
  instead it will just report the actions it would have taken.
---- tls.c	15 May 2004 19:09:42 -0000	1.20
-+++ tls.c	15 May 2004 20:13:13 -0000
+ 
+--- orig/testsuite/copy-atimes.test	2004-06-30 00:06:23
++++ testsuite/copy-atimes.test	2004-06-30 00:06:23
+@@ -0,0 +1,19 @@
++#! /bin/sh
++
++# Test rsync copying atimes
++
++. "$suitedir/rsync.fns"
++
++set -x
++
++mkdir "$fromdir"
++
++touch "$fromdir/foo"
++touch -a -t 200102031717.42 "$fromdir/foo"
++
++TLS_ARGS=--atime
++
++checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
++
++# The script would have aborted on error, so getting here means we've won.
++exit 0
+--- orig/testsuite/rsync.fns	2004-07-23 17:16:13
++++ testsuite/rsync.fns	2004-07-03 20:15:41
+@@ -50,7 +50,7 @@ printmsg() {
+ 
+ 
+ rsync_ls_lR() {
+-    find "$@" -print | sort | xargs "$TOOLDIR/tls"
++    find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS
+ }
+ 
+ rsync_getgroups() { 
+@@ -150,6 +150,8 @@ checkit() {
+     # We can just write everything to stdout/stderr, because the
+     # wrapper hides it unless there is a problem.
+ 
++    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
++
+     echo "Running: \"$1\""  
+     eval "$1" 
+     status=$?
+@@ -158,6 +160,12 @@ checkit() {
+     fi
+ 
+     echo "-------------"
++    echo "check how the directory listings compare with diff:"
++    echo ""
++    ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
++    diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
++
++    echo "-------------"
+     echo "check how the files compare with diff:"
+     echo ""
+     for f in `cd "$2"; find . -type f -print `
+@@ -165,12 +173,6 @@ checkit() {
+         diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
+     done
+ 
+-    echo "-------------"
+-    echo "check how the directory listings compare with diff:"
+-    echo ""
+-    ( cd "$2" && rsync_ls_lR . ) > "$tmpdir/ls-from"
+-    ( cd "$3" && rsync_ls_lR . ) > "$tmpdir/ls-to"
+-    diff $diffopt "$tmpdir/ls-from" "$tmpdir/ls-to" || failed=YES
+     if [ -z "$failed" ] ; then
+ 	return 0
+     else
+--- orig/tls.c	2004-05-15 20:10:13
++++ tls.c	2004-07-03 20:15:41
 @@ -39,6 +39,7 @@
  
  
@@ -413,16 +482,15 @@ command before "make":
  
  	return 0;
  }
---- util.c	15 May 2004 19:31:10 -0000	1.143
-+++ util.c	15 May 2004 20:13:13 -0000
-@@ -124,32 +124,40 @@ void overflow(char *str)
+--- orig/util.c	2004-07-26 16:33:24
++++ util.c	2004-07-03 20:15:41
+@@ -127,31 +127,39 @@ void overflow(char *str)
  
  
  
 -int set_modtime(char *fname, time_t modtime)
 +int set_times(char *fname, time_t modtime, time_t atime)
  {
- 	extern int dry_run;
  	if (dry_run)
  		return 0;
  
@@ -431,15 +499,15 @@ command before "make":
 +		char mtimebuf[200];
 +		char atimebuf[200];
 +
-+		strlcpy(mtimebuf, timestring(modtime), sizeof(mtimebuf));
-+		strlcpy(atimebuf, timestring(atime), sizeof(atimebuf));
++		strlcpy(mtimebuf, timestring(modtime), sizeof mtimebuf);
++		strlcpy(atimebuf, timestring(atime), sizeof atimebuf);
 +
 +		rprintf(FINFO,
 +			"set modtime, atime of %s to (%ld) %s, (%ld) %s\n",
- 			fname, (long) modtime,
+ 			fname, (long)modtime,
 -			asctime(localtime(&modtime)));
 +			mtimebuf,
-+			(long) atime, atimebuf);
++			(long)atime, atimebuf);
  	}
  
  	{
@@ -462,7 +530,7 @@ command before "make":
  		t[0].tv_usec = 0;
  		t[1].tv_sec = modtime;
  		t[1].tv_usec = 0;
-@@ -1058,8 +1066,8 @@ int msleep(int t)
+@@ -1103,8 +1111,8 @@ int msleep(int t)
  
  
  /**
@@ -473,83 +541,12 @@ command before "make":
   * --modify-window).
   *
   * @retval 0 if the times should be treated as the same
-@@ -1068,7 +1076,7 @@ int msleep(int t)
+@@ -1113,7 +1121,7 @@ int msleep(int t)
   *
   * @retval -1 if the 2nd is later
   **/
 -int cmp_modtime(time_t file1, time_t file2)
 +int cmp_time(time_t file1, time_t file2)
  {
- 	extern int modify_window;
- 
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ testsuite/copy-atimes.test	15 May 2004 20:13:13 -0000
-@@ -0,0 +1,22 @@
-+#! /bin/sh
-+
-+# Test rsync copying atimes
-+
-+. $srcdir/testsuite/rsync.fns
-+
-+set -x
-+
-+fromdir="$scratchdir/from"
-+todir="$scratchdir/to"
-+
-+mkdir "$fromdir"
-+
-+touch "$fromdir/foo"
-+touch -a -t 200102031717.42 "$fromdir/foo"
-+
-+TLS_ARGS=--atime
-+
-+checkit "$RSYNC -rtAgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
-+
-+# The script would have aborted on error, so getting here means we've won.
-+exit 0
---- testsuite/rsync.fns	4 Feb 2004 07:32:48 -0000	1.59
-+++ testsuite/rsync.fns	15 May 2004 20:13:13 -0000
-@@ -51,7 +51,7 @@ printmsg() {
- 
- 
- rsync_ls_lR() {
--    find "$@" -print | sort | xargs "$TOOLDIR/tls"
-+    find "$@" -print | sort | xargs "$TOOLDIR/tls" $TLS_ARGS
- }
- 
- rsync_getgroups() { 
-@@ -151,6 +151,8 @@ checkit() {
-     # We can just write everything to stdout/stderr, because the
-     # wrapper hides it unless there is a problem.
- 
-+    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
-+
-     echo "Running: \"$1\""  
-     eval "$1" 
-     status=$?
-@@ -159,6 +161,12 @@ checkit() {
-     fi
- 
-     echo "-------------"
-+    echo "check how the directory listings compare with diff:"
-+    echo ""
-+    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
-+    diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
-+
-+    echo "-------------"
-     echo "check how the files compare with diff:"
-     echo ""
-     for f in `cd "$2"; find . -type f -print `
-@@ -166,12 +174,6 @@ checkit() {
-         diff $diffopt "$2"/"$f" "$3"/"$f" || failed=YES
-     done
- 
--    echo "-------------"
--    echo "check how the directory listings compare with diff:"
--    echo ""
--    ( cd "$2" && rsync_ls_lR . ) > ${TMP}/ls-from 
--    ( cd "$3" && rsync_ls_lR . ) > ${TMP}/ls-to 
--    diff $diffopt ${TMP}/ls-from ${TMP}/ls-to || failed=YES
-     if [ -z "${failed}" ] ; then
- 	return 0
-     else
+ 	if (file2 > file1) {
+ 		if (file2 - file1 <= modify_window)