Fixed failing hunks.

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

diff --git a/atimes.diff b/atimes.diff
index 151378a..d1d5147 100644 (file)
--- a/atimes.diff
+++ b/atimes.diff
@@ -128,8 +128,8 @@ command before "make":
        file->length = st.st_size;
        file->mode = st.st_mode;
        file->uid = st.st_uid;
---- orig/generator.c   2004-10-06 00:12:16
-+++ generator.c        2004-07-03 20:15:41
+--- orig/generator.c   2004-11-03 20:30:45
++++ generator.c        2004-11-03 23:02:12
 @@ -92,7 +92,7 @@ static int skip_file(char *fname, struct
        if (ignore_times)
                return 0;
@@ -139,10 +139,10 @@ command before "make":
  }
  
  
-@@ -482,7 +482,7 @@ static void recv_generator(char *fname, 
+@@ -486,7 +486,7 @@ static void recv_generator(char *fname, 
        }
  
-       if (update_only && fnamecmp == fname
+       if (update_only && fnamecmp_type == FNAMECMP_FNAME
 -          && cmp_modtime(st.st_mtime, file->modtime) > 0) {
 +          && cmp_time(st.st_mtime, file->modtime) > 0) {
                if (verbose > 1)
@@ -230,7 +230,7 @@ command before "make":
        }
  
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
---- orig/rsync.h       2004-10-09 03:21:56
+--- orig/rsync.h       2004-11-03 20:30:45
 +++ rsync.h    2004-07-03 20:15:41
 @@ -54,6 +54,7 @@
  #define XMIT_HAS_IDEV_DATA (1<<9)
@@ -248,7 +248,7 @@ command before "make":
  
  #define FULL_FLUSH    1
  #define NORMAL_FLUSH  0
-@@ -429,6 +431,7 @@ struct file_struct {
+@@ -434,6 +436,7 @@ struct file_struct {
                struct hlink *links;
        } link_u;
        time_t modtime;