From f3e2725a954ec20ef78eca8a64ada243527041d4 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Wed, 9 Jun 2004 15:39:15 +0000
Subject: [PATCH] Fixed a failure.

---
 atimes.diff | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/atimes.diff b/atimes.diff
index 1dd2804..edded9d 100644
--- a/atimes.diff
+++ b/atimes.diff
@@ -5,7 +5,7 @@ command before "make":
 
 
 --- batch.c	15 May 2004 19:31:10 -0000	1.32
-+++ batch.c	6 Jun 2004 21:18:17 -0000
++++ batch.c	9 Jun 2004 15:37:30 -0000
 @@ -335,6 +335,8 @@ void show_flist(int index, struct file_s
  		rprintf(FINFO, "flist->flags=%#x\n", fptr[i]->flags);
  		rprintf(FINFO, "flist->modtime=%#lx\n",
@@ -15,8 +15,8 @@ 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	29 May 2004 21:21:17 -0000	1.226
-+++ flist.c	6 Jun 2004 21:18:17 -0000
+--- flist.c	7 Jun 2004 19:59:20 -0000	1.227
++++ flist.c	9 Jun 2004 15:37:30 -0000
 @@ -57,6 +57,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
@@ -32,7 +32,7 @@ command before "make":
 -		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
@@ -40,7 +40,7 @@ command before "make":
 -		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));
  }
@@ -119,7 +119,7 @@ command before "make":
  	file->length = file_length;
  	file->mode = mode;
  	file->uid = uid;
-@@ -848,6 +862,7 @@ skip_excludes:
+@@ -851,6 +865,7 @@ skip_excludes:
  
  	file->flags = flags;
  	file->modtime = st.st_mtime;
@@ -128,7 +128,7 @@ command before "make":
  	file->mode = st.st_mode;
  	file->uid = st.st_uid;
 --- generator.c	5 Jun 2004 16:16:30 -0000	1.86
-+++ generator.c	6 Jun 2004 21:18:17 -0000
++++ generator.c	9 Jun 2004 15:37:30 -0000
 @@ -101,7 +101,7 @@ static int skip_file(char *fname, struct
  		return 0;
  	}
@@ -147,8 +147,8 @@ command before "make":
  		if (verbose > 1)
  			rprintf(FINFO,"%s is newer\n",fname);
  		return;
---- options.c	6 Jun 2004 19:02:40 -0000	1.155
-+++ options.c	6 Jun 2004 21:18:18 -0000
+--- options.c	7 Jun 2004 22:05:22 -0000	1.156
++++ options.c	9 Jun 2004 15:37:31 -0000
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
@@ -173,7 +173,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 },
-@@ -846,6 +849,8 @@ void server_options(char **args,int *arg
+@@ -841,6 +844,8 @@ void server_options(char **args,int *arg
  		argstr[x++] = 'D';
  	if (preserve_times)
  		argstr[x++] = 't';
@@ -183,7 +183,7 @@ command before "make":
  		argstr[x++] = 'p';
  	if (recurse)
 --- rsync.c	21 May 2004 08:43:03 -0000	1.140
-+++ rsync.c	6 Jun 2004 21:18:18 -0000
++++ rsync.c	9 Jun 2004 15:37:31 -0000
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -229,7 +229,7 @@ command before "make":
  
  	change_uid = am_root && preserve_uid && st->st_uid != file->uid;
 --- rsync.h	16 May 2004 07:28:24 -0000	1.204
-+++ rsync.h	6 Jun 2004 21:18:18 -0000
++++ rsync.h	9 Jun 2004 15:37:31 -0000
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)
@@ -255,7 +255,7 @@ command before "make":
  	gid_t gid;
  	mode_t mode;
 --- rsync.yo	5 Jun 2004 16:16:30 -0000	1.171
-+++ rsync.yo	6 Jun 2004 21:18:19 -0000
++++ rsync.yo	9 Jun 2004 15:37:32 -0000
 @@ -300,6 +300,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
@@ -277,7 +277,7 @@ command before "make":
  instead it will just report the actions it would have taken.
  
 --- tls.c	15 May 2004 19:09:42 -0000	1.20
-+++ tls.c	6 Jun 2004 21:18:19 -0000
++++ tls.c	9 Jun 2004 15:37:32 -0000
 @@ -39,6 +39,7 @@
  
  
@@ -414,7 +414,7 @@ command before "make":
  	return 0;
  }
 --- util.c	5 Jun 2004 20:26:56 -0000	1.148
-+++ util.c	6 Jun 2004 21:18:19 -0000
++++ util.c	9 Jun 2004 15:37:32 -0000
 @@ -127,31 +127,39 @@ void overflow(char *str)
  
  
@@ -482,7 +482,7 @@ command before "make":
  	if (file2 > file1) {
  		if (file2 - file1 <= modify_window)
 --- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ testsuite/copy-atimes.test	6 Jun 2004 21:18:19 -0000
++++ testsuite/copy-atimes.test	9 Jun 2004 15:37:32 -0000
 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +
@@ -504,7 +504,7 @@ command before "make":
 +# The script would have aborted on error, so getting here means we've won.
 +exit 0
 --- testsuite/rsync.fns	18 May 2004 00:41:55 -0000	1.60
-+++ testsuite/rsync.fns	6 Jun 2004 21:18:19 -0000
++++ testsuite/rsync.fns	9 Jun 2004 15:37:32 -0000
 @@ -50,7 +50,7 @@ printmsg() {
  
  
-- 
2.34.1