The patches for 3.0.5pre1.

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

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index f8fcff2..a080ccc 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -133,7 +133,7 @@ diff --git a/options.c b/options.c
        if (files_from) {
                char *h, *p;
                int q;
-@@ -1967,6 +1986,25 @@ void server_options(char **args, int *argc_p)
+@@ -1968,6 +1987,25 @@ void server_options(char **args, int *argc_p)
                }
        }
  
@@ -251,7 +251,7 @@ diff --git a/receiver.c b/receiver.c
  extern char *partial_dir;
  extern char *basis_dir[];
  extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -395,6 +396,8 @@ int recv_files(int f_in, char *local_name)
+@@ -430,6 +431,8 @@ int recv_files(int f_in, char *local_name)
        const char *parent_dirname = "";
  #endif
        int ndx, recv_ok;
@@ -260,7 +260,7 @@ diff --git a/receiver.c b/receiver.c
  
        if (verbose > 2)
                rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -402,6 +405,23 @@ int recv_files(int f_in, char *local_name)
+@@ -437,6 +440,23 @@ int recv_files(int f_in, char *local_name)
        if (delay_updates)
                delayed_bits = bitbag_create(cur_flist->used + 1);
  
@@ -284,7 +284,7 @@ diff --git a/receiver.c b/receiver.c
        while (1) {
                cleanup_disable();
  
-@@ -674,6 +694,9 @@ int recv_files(int f_in, char *local_name)
+@@ -703,6 +723,9 @@ int recv_files(int f_in, char *local_name)
                else if (!am_server && verbose && do_progress)
                        rprintf(FINFO, "%s\n", fname);
  
@@ -294,7 +294,7 @@ diff --git a/receiver.c b/receiver.c
                /* recv file data */
                recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
                                       fname, fd2, F_LENGTH(file));
-@@ -688,6 +711,16 @@ int recv_files(int f_in, char *local_name)
+@@ -717,6 +740,16 @@ int recv_files(int f_in, char *local_name)
                        exit_cleanup(RERR_FILEIO);
                }