Fixed a failing hunk.

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

diff --git a/early-checksum.diff b/early-checksum.diff
index c16aa57..fad536f 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;
-@@ -692,6 +693,16 @@ static struct file_struct *receive_file_
+@@ -691,6 +692,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
-@@ -71,6 +71,7 @@ extern int ignore_timeout;
+@@ -70,6 +70,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[];
-@@ -374,7 +375,8 @@ void itemize(struct file_struct *file, i
+@@ -375,7 +376,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;
-@@ -383,6 +385,8 @@ int unchanged_file(char *fn, struct file
+@@ -384,6 +386,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];
@@ -73,7 +73,7 @@ for a local copy, so the old algorithm is used for local copies.
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1194,7 +1198,7 @@ static void recv_generator(char *fname, 
+@@ -1201,7 +1205,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -113,7 +113,7 @@ for a local copy, so the old algorithm is used for local copies.
  int local_server = 0;
  mode_t orig_umask = 0;
  struct file_list *the_file_list;
-@@ -749,6 +753,7 @@ static void do_server_recv(int f_in, int
+@@ -751,6 +755,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) {
-@@ -792,6 +797,10 @@ static void do_server_recv(int f_in, int
+@@ -794,6 +799,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) {
-@@ -800,6 +809,9 @@ static void do_server_recv(int f_in, int
+@@ -802,6 +811,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]);
  
-@@ -883,6 +895,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -885,6 +897,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;
-@@ -957,11 +970,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -959,11 +972,18 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }
  
@@ -171,11 +171,11 @@ for a local copy, so the old algorithm is used for local copies.
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -64,6 +64,7 @@
- #define FLAG_DEL_HERE (1<<3)  /* receiver/generator */
+@@ -65,6 +65,7 @@
  #define FLAG_HLINK_TOL (1<<4) /* receiver/generator */
  #define FLAG_NO_FUZZY (1<<5)  /* generator */
-+#define FLAG_SUM_DIFFERS (1<<6)       /* receiver/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