Fixed failing hunks.

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

diff --git a/early-checksum.diff b/early-checksum.diff
index 9341093..0041db4 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -8,9 +8,9 @@ to its checksum pass during its normal find-the-different-files pass.
 I have benchmarked this a little, and it appears to slow things down
 for a local copy, so the old algorithm is used for local copies.
 
---- orig/flist.c       2006-01-17 02:15:59
-+++ flist.c    2005-09-16 16:41:25
-@@ -36,6 +36,7 @@ extern int am_daemon;
+--- old/flist.c
++++ new/flist.c
+@@ -31,6 +31,7 @@ extern int am_daemon;
  extern int am_sender;
  extern int do_progress;
  extern int always_checksum;
@@ -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;
-@@ -706,6 +707,16 @@ static struct file_struct *receive_file_
+@@ -701,6 +702,16 @@ static struct file_struct *receive_file_
                        sum = empty_sum;
                }
                read_buf(f, sum, checksum_len);
@@ -34,10 +34,10 @@ for a local copy, so the old algorithm is used for local copies.
 +              }
        }
  
-       if (!preserve_perms) {
---- orig/generator.c   2006-01-14 20:27:09
-+++ generator.c        2005-12-15 23:16:48
-@@ -69,6 +69,7 @@ extern int ignore_timeout;
+       return file;
+--- old/generator.c
++++ new/generator.c
+@@ -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;
        }
-@@ -622,7 +626,7 @@ static int try_dests_reg(struct file_str
+@@ -620,7 +624,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;
-@@ -1142,7 +1146,7 @@ static void recv_generator(char *fname, 
+@@ -1182,7 +1186,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -82,9 +82,9 @@ for a local copy, so the old algorithm is used for local copies.
                if (partialptr) {
                        do_unlink(partialptr);
                        handle_partial_dir(partialptr, PDIR_DELETE);
---- orig/hlink.c       2006-01-14 20:27:09
-+++ hlink.c    2005-12-15 23:17:31
-@@ -210,7 +210,7 @@ int hard_link_check(struct file_struct *
+--- old/hlink.c
++++ new/hlink.c
+@@ -212,7 +212,7 @@ int hard_link_check(struct file_struct *
                                                        itemizing = code = 0;
                                                break;
                                        }
@@ -93,28 +93,25 @@ for a local copy, so the old algorithm is used for local copies.
                                                continue;
                                        statret = 1;
                                        st = &st3;
---- orig/main.c        2006-01-15 14:46:15
-+++ main.c     2005-11-07 05:00:49
-@@ -45,6 +45,7 @@ extern int copy_links;
+--- old/main.c
++++ new/main.c
+@@ -47,6 +47,7 @@ extern int copy_dirlinks;
  extern int keep_dirlinks;
  extern int preserve_hard_links;
  extern int protocol_version;
 +extern int always_checksum;
  extern int recurse;
  extern int relative_paths;
- extern int rsync_port;
-@@ -60,8 +61,10 @@ extern char *filesfrom_host;
- extern char *rsync_path;
- extern char *shell_cmd;
- extern char *batch_name;
-+extern char curr_dir[MAXPATHLEN];
+ extern int sanitize_paths;
+@@ -68,6 +69,7 @@ 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,
-@@ -710,6 +713,7 @@ static void do_server_recv(int f_in, int
+@@ -736,6 +738,7 @@ static void do_server_recv(int f_in, int
        struct file_list *flist;
        char *local_name = NULL;
        char *dir = NULL;
@@ -122,7 +119,7 @@ for a local copy, so the old algorithm is used for local copies.
        int save_verbose = verbose;
  
        if (filesfrom_fd >= 0) {
-@@ -753,6 +757,10 @@ static void do_server_recv(int f_in, int
+@@ -779,6 +782,10 @@ static void do_server_recv(int f_in, int
                filesfrom_fd = -1;
        }
  
@@ -133,7 +130,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) {
-@@ -761,6 +769,9 @@ static void do_server_recv(int f_in, int
+@@ -787,6 +794,9 @@ static void do_server_recv(int f_in, int
        }
        the_file_list = flist;
  
@@ -143,7 +140,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]);
  
-@@ -809,6 +820,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -848,6 +858,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 +148,7 @@ for a local copy, so the old algorithm is used for local copies.
        char *local_name = NULL;
  
        cleanup_child_pid = pid;
-@@ -880,11 +892,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -922,11 +933,18 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }
  
@@ -170,13 +167,13 @@ for a local copy, so the old algorithm is used for local copies.
        if (flist && flist->count > 0) {
                local_name = get_local_name(flist, argv[0]);
  
---- orig/rsync.h       2006-01-14 20:27:10
-+++ rsync.h    2005-09-16 16:41:26
+--- old/rsync.h
++++ new/rsync.h
 @@ -64,6 +64,7 @@
  #define FLAG_DEL_HERE (1<<3)  /* receiver/generator */
- #define FLAG_SENT (1<<3)      /* sender */
  #define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
-+#define FLAG_SUM_DIFFERS (1<<5)       /* receiver/generator */
+ #define FLAG_NO_FUZZY (1<<5)  /* generator */
++#define FLAG_SUM_DIFFERS (1<<6)       /* receiver/generator */
  
  /* update this if you make incompatible changes */
  #define PROTOCOL_VERSION 29