Matt's --trust-append option.

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

diff --git a/early-checksum.diff b/early-checksum.diff
index 3fcbae6..91be967 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/flist.c
 +++ new/flist.c
-@@ -33,6 +33,7 @@ extern int am_sender;
+@@ -34,6 +34,7 @@ extern int am_generator;
  extern int inc_recurse;
  extern int do_progress;
  extern int always_checksum;
@@ -24,11 +24,11 @@ To use this patch, run these commands for a successful build:
  extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
-@@ -850,6 +851,15 @@ static struct file_struct *recv_file_ent
+@@ -948,6 +949,15 @@ static struct file_struct *recv_file_ent
                        memcpy(bp, F_SUM(first), checksum_len);
                } else
                        read_buf(f, bp, checksum_len);
-+              if (pre_checksum && sum_len) {
++              if (pre_checksum && bp != tmp_sum) {
 +                      STRUCT_STAT st;
 +                      char *fname = f_name(file, NULL);
 +                      if (stat(fname, &st) == 0 && st.st_size == file_length) {
@@ -39,10 +39,10 @@ To use this patch, run these commands for a successful build:
 +              }
        }
  
-       if (S_ISREG(mode) || S_ISLNK(mode))
+ #ifdef SUPPORT_ACLS
 --- old/generator.c
 +++ new/generator.c
-@@ -73,6 +73,7 @@ extern int protocol_version;
+@@ -74,6 +74,7 @@ extern int protocol_version;
  extern int file_total;
  extern int fuzzy_basis;
  extern int always_checksum;
@@ -50,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[];
-@@ -569,7 +570,8 @@ void itemize(struct file_struct *file, i
+@@ -618,7 +619,8 @@ void itemize(const char *fnamecmp, struc
  
  
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
@@ -60,44 +60,44 @@ To use this patch, run these commands for a successful build:
  {
        if (st->st_size != F_LENGTH(file))
                return 0;
-@@ -578,6 +580,8 @@ int unchanged_file(char *fn, struct file
+@@ -627,6 +629,8 @@ int unchanged_file(char *fn, struct file
           of the file time to determine whether to sync */
        if (always_checksum > 0 && S_ISREG(st->st_mode)) {
-               char sum[MD4_SUM_LENGTH];
+               char sum[MAX_DIGEST_LEN];
 +              if (pre_checksum && fnamecmp_type == FNAMECMP_FNAME)
 +                      return !(file->flags & FLAG_SUM_DIFFERS);
                file_checksum(fn, sum, st->st_size);
                return memcmp(sum, F_SUM(file), checksum_len) == 0;
        }
-@@ -816,7 +820,7 @@ static int try_dests_reg(struct file_str
+@@ -847,7 +851,7 @@ static int try_dests_reg(struct file_str
                        match_level = 1;
                        /* FALL THROUGH */
                case 1:
--                      if (!unchanged_file(cmpbuf, file, stp))
-+                      if (!unchanged_file(cmpbuf, 0, file, stp))
+-                      if (!unchanged_file(cmpbuf, file, &sxp->st))
++                      if (!unchanged_file(cmpbuf, 0, file, &sxp->st))
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1508,7 +1512,7 @@ static void recv_generator(char *fname, 
+@@ -1559,7 +1563,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
--      else if (unchanged_file(fnamecmp, file, &st)) {
-+      else if (unchanged_file(fnamecmp, fnamecmp_type, file, &st)) {
+-      else if (unchanged_file(fnamecmp, file, &sx.st)) {
++      else if (unchanged_file(fnamecmp, fnamecmp_type, file, &sx.st)) {
                if (partialptr) {
                        do_unlink(partialptr);
                        handle_partial_dir(partialptr, PDIR_DELETE);
 --- old/hlink.c
 +++ new/hlink.c
-@@ -382,7 +382,7 @@ int hard_link_check(struct file_struct *
+@@ -393,7 +393,7 @@ int hard_link_check(struct file_struct *
                                }
                                break;
                        }
--                      if (!unchanged_file(cmpbuf, file, &alt_st))
-+                      if (!unchanged_file(cmpbuf, 0, file, &alt_st))
+-                      if (!unchanged_file(cmpbuf, file, &alt_sx.st))
++                      if (!unchanged_file(cmpbuf, 0, file, &alt_sx.st))
                                continue;
                        statret = 1;
-                       *stp = alt_st;
+                       if (unchanged_attrs(cmpbuf, file, &alt_sx))
 --- old/main.c
 +++ new/main.c
 @@ -46,6 +46,7 @@ extern int module_id;
@@ -177,11 +177,11 @@ To use this patch, run these commands for a successful build:
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -71,6 +71,7 @@
- #define FLAG_HLINK_LAST (1<<7)        /* receiver/generator */
+@@ -72,6 +72,7 @@
  #define FLAG_HLINK_DONE (1<<8)        /* receiver/generator */
  #define FLAG_LENGTH64 (1<<9)  /* sender/receiver/generator */
-+#define FLAG_SUM_DIFFERS (1<<10)/* receiver/generator */
+ #define FLAG_SKIP_GROUP (1<<10)       /* receiver/generator */
++#define FLAG_SUM_DIFFERS (1<<11)/* receiver/generator */
  
  /* These flags are passed to functions but not stored. */