Updated to apply cleanly.

[rsync/rsync-patches.git] / atimes.diff

diff --git a/atimes.diff b/atimes.diff
index 271557f..8104dc0 100644 (file)
--- 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    18 Jun 2004 17:23:13 -0000
++++ batch.c    30 Jun 2004 00:06:21 -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",
@@ -16,7 +16,7 @@ command before "make":
                        (double) fptr[i]->length);
                rprintf(FINFO, "flist->mode=%#o\n", (int) fptr[i]->mode);
 --- flist.c    18 Jun 2004 16:29:21 -0000      1.231
-+++ flist.c    18 Jun 2004 17:23:13 -0000
++++ flist.c    30 Jun 2004 00:06:21 -0000
 @@ -58,6 +58,7 @@ extern int relative_paths;
  extern int implied_dirs;
  extern int copy_links;
@@ -128,28 +128,28 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
---- generator.c        18 Jun 2004 16:30:24 -0000      1.88
-+++ generator.c        18 Jun 2004 17:23:14 -0000
-@@ -102,7 +102,7 @@ static int skip_file(char *fname, struct
+--- generator.c        29 Jun 2004 19:19:00 -0000      1.92
++++ generator.c        30 Jun 2004 00:06:21 -0000
+@@ -99,7 +99,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;
  }
  
  
-@@ -485,7 +485,7 @@ void recv_generator(char *fname, struct 
-               return;
+@@ -484,7 +484,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);
                return;
---- options.c  7 Jun 2004 22:05:22 -0000       1.156
-+++ options.c  18 Jun 2004 17:23:14 -0000
+--- options.c  20 Jun 2004 19:47:05 -0000      1.157
++++ options.c  30 Jun 2004 00:06:21 -0000
 @@ -48,6 +48,7 @@ int preserve_devices = 0;
  int preserve_uid = 0;
  int preserve_gid = 0;
@@ -184,7 +184,7 @@ command before "make":
                argstr[x++] = 'p';
        if (recurse)
 --- rsync.c    11 Jun 2004 07:40:45 -0000      1.141
-+++ rsync.c    18 Jun 2004 17:23:14 -0000
++++ rsync.c    30 Jun 2004 00:06:22 -0000
 @@ -25,6 +25,7 @@
  extern int verbose;
  extern int dry_run;
@@ -230,7 +230,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    18 Jun 2004 17:23:14 -0000
++++ rsync.h    30 Jun 2004 00:06:22 -0000
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
  #define XMIT_SAME_DEV (1<<10)
@@ -256,7 +256,7 @@ command before "make":
        gid_t gid;
        mode_t mode;
 --- rsync.yo   5 Jun 2004 16:16:30 -0000       1.171
-+++ rsync.yo   18 Jun 2004 17:23:15 -0000
++++ rsync.yo   30 Jun 2004 00:06:23 -0000
 @@ -300,6 +300,7 @@ verb(
   -g, --group                 preserve group
   -D, --devices               preserve devices (root only)
@@ -278,7 +278,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      18 Jun 2004 17:23:15 -0000
++++ tls.c      30 Jun 2004 00:06:23 -0000
 @@ -39,6 +39,7 @@
  
  
@@ -415,7 +415,7 @@ command before "make":
        return 0;
  }
 --- util.c     9 Jun 2004 21:51:07 -0000       1.149
-+++ util.c     18 Jun 2004 17:23:15 -0000
++++ util.c     30 Jun 2004 00:06:23 -0000
 @@ -127,31 +127,39 @@ void overflow(char *str)
  
  
@@ -483,7 +483,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 18 Jun 2004 17:23:15 -0000
++++ testsuite/copy-atimes.test 30 Jun 2004 00:06:23 -0000
 @@ -0,0 +1,19 @@
 +#! /bin/sh
 +
@@ -504,8 +504,8 @@ 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        18 Jun 2004 17:23:15 -0000
+--- testsuite/rsync.fns        24 Jun 2004 04:46:02 -0000      1.61
++++ testsuite/rsync.fns        30 Jun 2004 00:06:23 -0000
 @@ -50,7 +50,7 @@ printmsg() {