The patches for 3.0.4pre1.

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

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 9fea688..de0410b 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -41,7 +41,7 @@ diff --git a/generator.c b/generator.c
  extern int size_only;
  extern OFF_T max_size;
  extern OFF_T min_size;
-@@ -711,7 +712,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
+@@ -714,7 +715,7 @@ void itemize(const char *fnamecmp, struct file_struct *file, int ndx, int statre
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
  int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
  {
@@ -133,7 +133,7 @@ diff --git a/options.c b/options.c
        if (files_from) {
                char *h, *p;
                int q;
-@@ -1953,6 +1972,25 @@ void server_options(char **args, int *argc_p)
+@@ -1959,6 +1978,25 @@ void server_options(char **args, int *argc_p)
                }
        }
  
@@ -171,7 +171,7 @@ diff --git a/pipe.c b/pipe.c
 +{
 +      pid_t pid;
 +      int pipefds[2];
-+      
++
 +      if (verbose >= 2)
 +              print_child_argv("opening connection using:", command);
 +
@@ -215,7 +215,7 @@ diff --git a/pipe.c b/pipe.c
 +pid_t run_filter_on_file(char *command[], int out, int in)
 +{
 +      pid_t pid;
-+      
++
 +      if (verbose >= 2)
 +              print_child_argv("opening connection using:", command);
 +
@@ -314,7 +314,7 @@ diff --git a/receiver.c b/receiver.c
 diff --git a/rsync.h b/rsync.h
 --- a/rsync.h
 +++ b/rsync.h
-@@ -135,6 +135,7 @@
+@@ -137,6 +137,7 @@
  #define IOERR_DEL_LIMIT (1<<2)
  
  #define MAX_ARGS 1000