Fixed failing hunks.

[rsync-patches.git] / early-checksum.diff

diff --git a/early-checksum.diff b/early-checksum.diff
index 0f66edc873eff5b0824e18d4bd11de3fb6c8e00a..f64037df0f2bc121399e2b7444c9f1e5f5d31fdb 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -37,7 +37,7 @@ for a local copy, so the old algorithm is used for local copies.
        return file;
 --- old/generator.c
 +++ new/generator.c
-@@ -71,6 +71,7 @@ extern int ignore_timeout;
+@@ -72,6 +72,7 @@ extern int ignore_timeout;
  extern int protocol_version;
  extern int fuzzy_basis;
  extern int always_checksum;
@@ -73,7 +73,7 @@ for a local copy, so the old algorithm is used for local copies.
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1147,7 +1151,7 @@ static void recv_generator(char *fname, 
+@@ -1159,7 +1163,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -95,7 +95,7 @@ for a local copy, so the old algorithm is used for local copies.
                                        st = &st3;
 --- old/main.c
 +++ new/main.c
-@@ -45,6 +45,7 @@ extern int copy_links;
+@@ -44,6 +44,7 @@ extern int copy_links;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int protocol_version;
@@ -103,18 +103,17 @@ for a local copy, so the old algorithm is used for local copies.
  extern int recurse;
  extern int relative_paths;
  extern int rsync_port;
-@@ -60,8 +61,10 @@ extern char *filesfrom_host;
+@@ -59,7 +60,9 @@ extern char *filesfrom_host;
  extern char *rsync_path;
  extern char *shell_cmd;
  extern char *batch_name;
 +extern char curr_dir[MAXPATHLEN];
  
- int local_server = 0;
 +int pre_checksum = 0;
+ int local_server = 0;
+ mode_t orig_umask = 0;
  struct file_list *the_file_list;
- 
- /* There's probably never more than at most 2 outstanding child processes,
-@@ -719,6 +722,7 @@ static void do_server_recv(int f_in, int
+@@ -717,6 +720,7 @@ static void do_server_recv(int f_in, int
        struct file_list *flist;
        char *local_name = NULL;
        char *dir = NULL;
@@ -122,7 +121,7 @@ for a local copy, so the old algorithm is used for local copies.
        int save_verbose = verbose;
  
        if (filesfrom_fd >= 0) {
-@@ -762,6 +766,10 @@ static void do_server_recv(int f_in, int
+@@ -760,6 +764,10 @@ static void do_server_recv(int f_in, int
                filesfrom_fd = -1;
        }
  
@@ -133,7 +132,7 @@ for a local copy, so the old algorithm is used for local copies.
        flist = recv_file_list(f_in);
        verbose = save_verbose;
        if (!flist) {
-@@ -770,6 +778,9 @@ static void do_server_recv(int f_in, int
+@@ -768,6 +776,9 @@ static void do_server_recv(int f_in, int
        }
        the_file_list = flist;
  
@@ -143,7 +142,7 @@ for a local copy, so the old algorithm is used for local copies.
        if (argc > 0)
                local_name = get_local_name(flist,argv[0]);
  
-@@ -821,6 +832,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -819,6 +830,7 @@ int client_run(int f_in, int f_out, pid_
  {
        struct file_list *flist = NULL;
        int exit_code = 0, exit_code2 = 0;
@@ -151,7 +150,7 @@ for a local copy, so the old algorithm is used for local copies.
        char *local_name = NULL;
  
        cleanup_child_pid = pid;
-@@ -895,11 +907,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -893,11 +905,18 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }