Fixed some patch fuzz.

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

diff --git a/early-checksum.diff b/early-checksum.diff
index 5794dd4983003b01a9f7742a3237a9598e7bfc93..c16aa573faa1f1c64edcd92be77267c3da3570a7 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -18,7 +18,7 @@ for a local copy, so the old algorithm is used for local copies.
  extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
-@@ -699,6 +700,16 @@ static struct file_struct *receive_file_
+@@ -692,6 +693,16 @@ static struct file_struct *receive_file_
                        sum = empty_sum;
                }
                read_buf(f, sum, checksum_len);
@@ -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
-@@ -73,6 +73,7 @@ extern int ignore_timeout;
+@@ -71,6 +71,7 @@ extern int ignore_timeout;
  extern int protocol_version;
  extern int fuzzy_basis;
  extern int always_checksum;
@@ -45,7 +45,7 @@ for a local copy, so the old algorithm is used for local copies.
  extern int checksum_len;
  extern char *partial_dir;
  extern char *basis_dir[];
-@@ -376,7 +377,8 @@ void itemize(struct file_struct *file, i
+@@ -374,7 +375,8 @@ void itemize(struct file_struct *file, i
  
  
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
@@ -55,7 +55,7 @@ for a local copy, so the old algorithm is used for local copies.
  {
        if (st->st_size != file->length)
                return 0;
-@@ -385,6 +387,8 @@ int unchanged_file(char *fn, struct file
+@@ -383,6 +385,8 @@ int unchanged_file(char *fn, struct file
           of the file time to determine whether to sync */
        if (always_checksum && S_ISREG(st->st_mode)) {
                char sum[MD4_SUM_LENGTH];
@@ -64,7 +64,7 @@ for a local copy, so the old algorithm is used for local copies.
                file_checksum(fn, sum, st->st_size);
                return memcmp(sum, file->u.sum, checksum_len) == 0;
        }
-@@ -628,7 +632,7 @@ static int try_dests_reg(struct file_str
+@@ -626,7 +630,7 @@ static int try_dests_reg(struct file_str
                        match_level = 1;
                        /* FALL THROUGH */
                case 1:
@@ -73,7 +73,7 @@ for a local copy, so the old algorithm is used for local copies.
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1197,7 +1201,7 @@ static void recv_generator(char *fname, 
+@@ -1194,7 +1198,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -103,17 +103,17 @@ for a local copy, so the old algorithm is used for local copies.
  extern int recurse;
  extern int relative_paths;
  extern int sanitize_paths;
-@@ -66,6 +67,9 @@ extern char *rsync_path;
- extern char *shell_cmd;
+@@ -69,6 +70,9 @@ extern char *shell_cmd;
  extern char *batch_name;
+ extern struct filter_list_struct server_filter_list;
  
 +extern char curr_dir[MAXPATHLEN];
 +
 +int pre_checksum = 0;
  int local_server = 0;
- int startdir_depth = 0;
  mode_t orig_umask = 0;
-@@ -741,6 +745,7 @@ static void do_server_recv(int f_in, int
+ struct file_list *the_file_list;
+@@ -749,6 +753,7 @@ static void do_server_recv(int f_in, int
        struct file_list *flist;
        char *local_name = NULL;
        char *dir = NULL;
@@ -121,7 +121,7 @@ for a local copy, so the old algorithm is used for local copies.
        int save_verbose = verbose;
  
        if (filesfrom_fd >= 0) {
-@@ -784,6 +789,10 @@ static void do_server_recv(int f_in, int
+@@ -792,6 +797,10 @@ static void do_server_recv(int f_in, int
                filesfrom_fd = -1;
        }
  
@@ -132,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) {
-@@ -792,6 +801,9 @@ static void do_server_recv(int f_in, int
+@@ -800,6 +809,9 @@ static void do_server_recv(int f_in, int
        }
        the_file_list = flist;
  
@@ -142,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]);
  
-@@ -851,6 +863,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -883,6 +895,7 @@ int client_run(int f_in, int f_out, pid_
  {
        struct file_list *flist = NULL;
        int exit_code = 0, exit_code2 = 0;
@@ -150,7 +150,7 @@ for a local copy, so the old algorithm is used for local copies.
        char *local_name = NULL;
  
        cleanup_child_pid = pid;
-@@ -925,11 +938,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -957,11 +970,18 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }