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 2005-11-10 16:58:36
+--- orig/flist.c 2006-01-21 21:02:30
+++ flist.c 2005-09-16 16:41:25
@@ -36,6 +36,7 @@ extern int am_daemon;
extern int am_sender;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -707,6 +708,16 @@ static struct file_struct *receive_file_
+@@ -708,6 +709,16 @@ static struct file_struct *receive_file_
sum = empty_sum;
}
read_buf(f, sum, checksum_len);
+ if (pre_checksum) {
+ char sum2[MD4_SUM_LENGTH];
+ STRUCT_STAT st;
-+ char *fname = f_name(file);
++ 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)
}
if (!preserve_perms) {
---- orig/generator.c 2005-12-15 23:00:49
+--- orig/generator.c 2006-01-21 21:02:30
+++ generator.c 2005-12-15 23:16:48
@@ -69,6 +69,7 @@ extern int ignore_timeout;
extern int protocol_version;
extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -376,7 +377,8 @@ void itemize(struct file_struct *file, i
+@@ -377,7 +378,8 @@ void itemize(struct file_struct *file, i
/* Perform our quick-check heuristic for determining if a file is unchanged. */
{
if (st->st_size != file->length)
return 0;
-@@ -385,6 +387,8 @@ int unchanged_file(char *fn, struct file
+@@ -386,6 +388,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];
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
+@@ -623,7 +627,7 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
continue;
best_match = j;
match_level = 2;
-@@ -1160,7 +1164,7 @@ static void recv_generator(char *fname,
+@@ -1145,7 +1149,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
if (partialptr) {
do_unlink(partialptr);
handle_partial_dir(partialptr, PDIR_DELETE);
---- orig/hlink.c 2005-12-15 23:00:49
+--- 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 *
itemizing = code = 0;
continue;
statret = 1;
st = &st3;
---- orig/main.c 2005-12-15 07:55:39
+--- 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;
extern int keep_dirlinks;
struct file_list *the_file_list;
/* There's probably never more than at most 2 outstanding child processes,
-@@ -659,6 +662,7 @@ static void do_server_recv(int f_in, int
+@@ -710,6 +713,7 @@ static void do_server_recv(int f_in, int
struct file_list *flist;
char *local_name = NULL;
char *dir = NULL;
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
-@@ -702,6 +706,10 @@ static void do_server_recv(int f_in, int
+@@ -753,6 +757,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
-@@ -710,6 +718,9 @@ static void do_server_recv(int f_in, int
+@@ -761,6 +769,9 @@ static void do_server_recv(int f_in, int
}
the_file_list = flist;
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -758,6 +769,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -809,6 +820,7 @@ int client_run(int f_in, int f_out, pid_
{
struct file_list *flist = NULL;
int exit_code = 0, exit_code2 = 0;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -829,11 +841,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -880,11 +892,18 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
if (flist && flist->count > 0) {
local_name = get_local_name(flist, argv[0]);
---- orig/rsync.h 2005-12-15 23:00:49
-+++ rsync.h 2005-09-16 16:41:26
+--- orig/rsync.h 2006-01-21 21:02:30
++++ rsync.h 2006-01-21 21:08:49
@@ -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