Latest patches.

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

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index 481c884a2549bc74945de65d1c9ae7687decd0e7..7bfe7fc93beef10837a3a2e3251fa9138fd2e1a6 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -30,7 +30,7 @@ To use this patch, run these commands for a successful build:
     ./configure                                (optional if already run)
     make
 
-based-on: d1a1fec1340254926e17f5d83f848f7574286a33
+based-on: c4a3f55be35726d0a033996dc37b0fb248b45cb5
 diff --git a/generator.c b/generator.c
 --- a/generator.c
 +++ b/generator.c
@@ -117,7 +117,7 @@ diff --git a/options.c b/options.c
  #ifdef HAVE_SETVBUF
    {"outbuf",           0,  POPT_ARG_STRING, &outbuf_mode, 0, 0, 0 },
  #endif
-@@ -2294,6 +2303,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
+@@ -2318,6 +2327,16 @@ int parse_arguments(int *argc_p, const char ***argv_p)
                }
        }
  
@@ -134,7 +134,7 @@ diff --git a/options.c b/options.c
        if (files_from) {
                char *h, *p;
                int q;
-@@ -2659,6 +2678,25 @@ void server_options(char **args, int *argc_p)
+@@ -2683,6 +2702,25 @@ void server_options(char **args, int *argc_p)
        else if (missing_args == 1 && !am_sender)
                args[ac++] = "--ignore-missing-args";
  
@@ -260,7 +260,7 @@ diff --git a/receiver.c b/receiver.c
  extern char *partial_dir;
  extern char *basis_dir[MAX_BASIS_DIRS+1];
  extern char sender_file_sum[MAX_DIGEST_LEN];
-@@ -530,6 +531,8 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -528,6 +529,8 @@ int recv_files(int f_in, int f_out, char *local_name)
        const char *parent_dirname = "";
  #endif
        int ndx, recv_ok;
@@ -269,7 +269,7 @@ diff --git a/receiver.c b/receiver.c
  
        if (DEBUG_GTE(RECV, 1))
                rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -537,6 +540,23 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -535,6 +538,23 @@ int recv_files(int f_in, int f_out, char *local_name)
        if (delay_updates)
                delayed_bits = bitbag_create(cur_flist->used + 1);
  
@@ -293,7 +293,7 @@ diff --git a/receiver.c b/receiver.c
        while (1) {
                cleanup_disable();
  
-@@ -841,6 +861,9 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -839,6 +859,9 @@ int recv_files(int f_in, int f_out, char *local_name)
                else if (!am_server && INFO_GTE(NAME, 1) && INFO_EQ(PROGRESS, 1))
                        rprintf(FINFO, "%s\n", fname);
  
@@ -303,7 +303,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));
-@@ -855,6 +878,16 @@ int recv_files(int f_in, int f_out, char *local_name)
+@@ -853,6 +876,16 @@ int recv_files(int f_in, int f_out, char *local_name)
                        exit_cleanup(RERR_FILEIO);
                }
  
@@ -351,7 +351,7 @@ diff --git a/rsync.yo b/rsync.yo
       --protocol=NUM          force an older protocol version to be used
       --iconv=CONVERT_SPEC    request charset conversion of filenames
       --checksum-seed=NUM     set block/file checksum seed (advanced)
-@@ -2582,6 +2585,33 @@ file previously generated by bf(--write-batch).
+@@ -2616,6 +2619,33 @@ file previously generated by bf(--write-batch).
  If em(FILE) is bf(-), the batch data will be read from standard input.
  See the "BATCH MODE" section for details.
  
@@ -382,9 +382,9 @@ diff --git a/rsync.yo b/rsync.yo
 +received on input, you should use --times-only to disable size and
 +content checks on subsequent rsync runs.
 +
- dit(bf(--protocol=NUM)) Force an older protocol version to be used.  This
- is useful for creating a batch file that is compatible with an older
- version of rsync.  For instance, if rsync 2.6.4 is being used with the
+ )
+ description(
+ 
 diff --git a/sender.c b/sender.c
 --- a/sender.c
 +++ b/sender.c