- Fixed a problem with the sscanf() count (now 5, not 4).

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

diff --git a/early-checksum.diff b/early-checksum.diff
index 0f66edc..25aa0de 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -10,7 +10,7 @@ for a local copy, so the old algorithm is used for local copies.
 
 --- old/flist.c
 +++ new/flist.c
-@@ -36,6 +36,7 @@ extern int am_daemon;
+@@ -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;
-@@ -711,6 +712,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);
@@ -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[];
-@@ -377,7 +378,8 @@ void itemize(struct file_struct *file, i
+@@ -376,7 +377,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;
-@@ -386,6 +388,8 @@ int unchanged_file(char *fn, struct file
+@@ -385,6 +387,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;
        }
-@@ -623,7 +627,7 @@ static int try_dests_reg(struct file_str
+@@ -622,7 +626,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;
-@@ -1147,7 +1151,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
-@@ -210,7 +210,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))
@@ -95,26 +95,25 @@ for a local copy, so the old algorithm is used for local copies.
                                        st = &st3;
 --- old/main.c
 +++ new/main.c
-@@ -45,6 +45,7 @@ extern int copy_links;
+@@ -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;
+@@ -71,6 +72,9 @@ extern char *batch_name;
+ extern char curr_dir[MAXPATHLEN];
+ extern struct filter_list_struct server_filter_list;
  
- int local_server = 0;
++extern char curr_dir[MAXPATHLEN];
++
 +int pre_checksum = 0;
- struct file_list *the_file_list;
- 
- /* There's probably never more than at most 2 outstanding child processes,
-@@ -719,6 +722,7 @@ static void do_server_recv(int f_in, int
+ 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
        struct file_list *flist;
        char *local_name = NULL;
        char *dir = NULL;
@@ -122,18 +121,18 @@ for a local copy, so the old algorithm is used for local copies.
        int save_verbose = verbose;
  
        if (filesfrom_fd >= 0) {
-@@ -762,6 +766,10 @@ static void do_server_recv(int f_in, int
+@@ -827,6 +832,10 @@ static void do_server_recv(int f_in, int
                filesfrom_fd = -1;
        }
  
 +      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;
        if (!flist) {
-@@ -770,6 +778,9 @@ static void do_server_recv(int f_in, int
+@@ -835,6 +844,9 @@ static void do_server_recv(int f_in, int
        }
        the_file_list = flist;
  
@@ -143,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]);
  
-@@ -821,6 +832,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -916,6 +928,7 @@ int client_run(int f_in, int f_out, pid_
  {
        struct file_list *flist = NULL;
        int exit_code = 0, exit_code2 = 0;
@@ -151,13 +150,13 @@ for a local copy, so the old algorithm is used for local copies.
        char *local_name = NULL;
  
        cleanup_child_pid = pid;
-@@ -895,11 +907,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -990,11 +1003,18 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }
  
 +      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);
@@ -172,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