- Make sure that our patched files can end up with the same mtime as

[rsync/rsync-patches.git] / source-filter_dest-filter.diff

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index f50e861..4495b6a 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -40,7 +40,7 @@ To use this patch, run these commands for a successful build:
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -507,7 +508,7 @@ void itemize(struct file_struct *file, i
+@@ -508,7 +509,7 @@ void itemize(struct file_struct *file, i
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -51,7 +51,7 @@ To use this patch, run these commands for a successful build:
        /* if always checksum is set then we use the checksum instead
 --- old/main.c
 +++ new/main.c
-@@ -122,7 +122,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -126,7 +126,7 @@ pid_t wait_process(pid_t pid, int *statu
  }
  
  /* Wait for a process to exit, calling io_flush while waiting. */
@@ -249,12 +249,12 @@ To use this patch, run these commands for a successful build:
 @@ -348,6 +349,8 @@ int recv_files(int f_in, struct file_lis
        enum logcode log_code = log_before_transfer ? FLOG : FINFO;
        int max_phase = protocol_version >= 29 ? 2 : 1;
-       int i, recv_ok;
+       int ndx, recv_ok;
 +      pid_t pid = 0;
 +      char *filter_argv[MAX_FILTER_ARGS + 1];
  
        if (verbose > 2)
-               rprintf(FINFO,"recv_files(%d) starting\n",flist->count);
+               rprintf(FINFO, "recv_files(%d) starting\n", flist->count);
 @@ -362,6 +365,23 @@ int recv_files(int f_in, struct file_lis
  
        updating_basis = inplace;