Fixed failing hunks.

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

diff --git a/early-checksum.diff b/early-checksum.diff
index 948b1ed22efeee763bbefea3b250aa4b86b2b897..a819d2f7676c56526141a3253105d8c95666e4f3 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -24,17 +24,16 @@ To use this patch, run these commands for a successful build:
  extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
-@@ -697,6 +698,16 @@ static struct file_struct *receive_file_
-                       sum = empty_sum;
+@@ -723,6 +724,15 @@ static struct file_struct *recv_file_ent
+                       bp = tmp_sum;
                }
-               read_buf(f, sum, checksum_len);
-+              if (pre_checksum) {
-+                      char sum2[MD4_SUM_LENGTH];
+               read_buf(f, bp, checksum_len);
++              if (pre_checksum && sum_len) {
 +                      STRUCT_STAT st;
 +                      char *fname = f_name(file, NULL);
 +                      if (stat(fname, &st) == 0 && st.st_size == file_length) {
-+                              file_checksum(fname, sum2, st.st_size);
-+                              if (memcmp(sum, sum2, checksum_len) != 0)
++                              file_checksum(fname, tmp_sum, st.st_size);
++                              if (memcmp(bp, tmp_sum, checksum_len) != 0)
 +                                      file->flags |= FLAG_SUM_DIFFERS;
 +                      }
 +              }
@@ -43,7 +42,7 @@ To use this patch, run these commands for a successful build:
        return file;
 --- old/generator.c
 +++ new/generator.c
-@@ -70,6 +70,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;
@@ -51,7 +50,7 @@ To use this patch, run these commands for a successful build:
  extern int checksum_len;
  extern char *partial_dir;
  extern char *basis_dir[];
-@@ -376,7 +377,8 @@ void itemize(struct file_struct *file, i
+@@ -507,7 +508,8 @@ void itemize(struct file_struct *file, i
  
  
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
@@ -61,16 +60,16 @@ To use this patch, run these commands for a successful build:
  {
        if (st->st_size != file->length)
                return 0;
-@@ -385,6 +387,8 @@ int unchanged_file(char *fn, struct file
+@@ -516,6 +518,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];
 +              if (pre_checksum && fnamecmp_type == FNAMECMP_FNAME)
 +                      return !(file->flags & FLAG_SUM_DIFFERS);
                file_checksum(fn, sum, st->st_size);
-               return memcmp(sum, file->u.sum, checksum_len) == 0;
+               return memcmp(sum, F_SUM(file), checksum_len) == 0;
        }
-@@ -622,7 +626,7 @@ static int try_dests_reg(struct file_str
+@@ -752,7 +756,7 @@ static int try_dests_reg(struct file_str
                        match_level = 1;
                        /* FALL THROUGH */
                case 1:
@@ -79,7 +78,7 @@ To use this patch, run these commands for a successful build:
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1215,7 +1219,7 @@ static void recv_generator(char *fname, 
+@@ -1420,7 +1424,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -90,7 +89,7 @@ To use this patch, run these commands for a successful build:
                        handle_partial_dir(partialptr, PDIR_DELETE);
 --- old/hlink.c
 +++ new/hlink.c
-@@ -224,7 +224,7 @@ int hard_link_check(struct file_struct *
+@@ -235,7 +235,7 @@ int hard_link_check(struct file_struct *
                                                }
                                                break;
                                        }
@@ -119,7 +118,7 @@ To use this patch, run these commands for a successful build:
  int local_server = 0;
  int new_root_dir = 0;
  mode_t orig_umask = 0;
-@@ -784,6 +788,7 @@ static void do_server_recv(int f_in, int
+@@ -785,6 +789,7 @@ static void do_server_recv(int f_in, int
        struct file_list *flist;
        char *local_name = NULL;
        char *dir = NULL;
@@ -127,7 +126,7 @@ To use this patch, run these commands for a successful build:
        int save_verbose = verbose;
  
        if (filesfrom_fd >= 0) {
-@@ -827,6 +832,10 @@ static void do_server_recv(int f_in, int
+@@ -828,6 +833,10 @@ static void do_server_recv(int f_in, int
                filesfrom_fd = -1;
        }
  
@@ -138,7 +137,7 @@ To use this patch, run these commands for a successful build:
        flist = recv_file_list(f_in);
        verbose = save_verbose;
        if (!flist) {
-@@ -835,6 +844,9 @@ static void do_server_recv(int f_in, int
+@@ -836,6 +845,9 @@ static void do_server_recv(int f_in, int
        }
        the_file_list = flist;
  
@@ -148,7 +147,7 @@ To use this patch, run these commands for a successful build:
        if (argc > 0)
                local_name = get_local_name(flist,argv[0]);
  
-@@ -916,6 +928,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -917,6 +929,7 @@ int client_run(int f_in, int f_out, pid_
  {
        struct file_list *flist = NULL;
        int exit_code = 0, exit_code2 = 0;
@@ -156,7 +155,7 @@ To use this patch, run these commands for a successful build:
        char *local_name = NULL;
  
        cleanup_child_pid = pid;
-@@ -990,11 +1003,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -991,11 +1004,18 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }
  
@@ -177,11 +176,11 @@ To use this patch, run these commands for a successful build:
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -65,6 +65,7 @@
- #define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
- #define FLAG_NO_FUZZY (1<<5)  /* generator */
- #define FLAG_MISSING (1<<6)   /* generator */
-+#define FLAG_SUM_DIFFERS (1<<7)       /* receiver/generator */
- 
- /* update this if you make incompatible changes */
- #define PROTOCOL_VERSION 29
+@@ -61,6 +61,7 @@
+ #define FLAG_SENT (1<<1)      /* sender/generator */
+ #define FLAG_XFER_DIR (1<<2)  /* sender/receiver/generator */
+ #define FLAG_MOUNT_DIR (1<<3) /* sender/generator */
++#define FLAG_SUM_DIFFERS (1<<3)       /* receiver/generator (non-dirs) */
+ #define FLAG_MISSING_DIR (1<<4)       /* generator (dirs only) */
+ #define FLAG_HLINK_INFO (1<<5)        /* receiver/generator */
+ #define FLAG_HLINK_FIRST (1<<6)       /* receiver/generator */