Fixed compilation problems that crept into the code.

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

diff --git a/early-checksum.diff b/early-checksum.diff
index 152d08f..25aa0de 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;
-@@ -693,6 +694,16 @@ static struct file_struct *receive_file_
+@@ -697,6 +698,16 @@ static struct file_struct *receive_file_
                        sum = empty_sum;
                }
                read_buf(f, sum, checksum_len);
@@ -73,7 +73,7 @@ for a local copy, so the old algorithm is used for local copies.
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1210,7 +1214,7 @@ static void recv_generator(char *fname, 
+@@ -1212,7 +1216,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -84,8 +84,8 @@ for a local copy, so the old algorithm is used for local copies.
                        handle_partial_dir(partialptr, PDIR_DELETE);
 --- old/hlink.c
 +++ new/hlink.c
-@@ -220,7 +220,7 @@ int hard_link_check(struct file_struct *
-                                                       itemizing = code = 0;
+@@ -222,7 +222,7 @@ int hard_link_check(struct file_struct *
+                                               }
                                                break;
                                        }
 -                                      if (!unchanged_file(cmpbuf, file, &st3))
@@ -127,7 +127,7 @@ for a local copy, so the old algorithm is used for local copies.
  
 +      strlcpy(olddir, curr_dir, sizeof olddir);
 +      if (always_checksum && !local_server && argc > 0)
-+              pre_checksum = push_dir(argv[0]);
++              pre_checksum = push_dir(argv[0], 0);
 +
        flist = recv_file_list(f_in);
        verbose = save_verbose;
@@ -156,7 +156,7 @@ for a local copy, so the old algorithm is used for local copies.
  
 +      strlcpy(olddir, curr_dir, sizeof olddir);
 +      if (always_checksum && !local_server)
-+              pre_checksum = push_dir(argv[0]);
++              pre_checksum = push_dir(argv[0], 0);
 +
        if (write_batch && !am_server)
                start_write_batch(f_in);