--- 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;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -711,6 +712,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);
extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -377,7 +378,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. */
{
if (st->st_size != file->length)
return 0;
-@@ -386,6 +388,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];
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
+@@ -620,7 +624,7 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
continue;
best_match = j;
match_level = 2;
-@@ -1147,7 +1151,7 @@ static void recv_generator(char *fname,
+@@ -1182,7 +1186,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
handle_partial_dir(partialptr, PDIR_DELETE);
--- old/hlink.c
+++ new/hlink.c
-@@ -210,7 +210,7 @@ int hard_link_check(struct file_struct *
+@@ -212,7 +212,7 @@ int hard_link_check(struct file_struct *
itemizing = code = 0;
break;
}
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;
+@@ -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,
-@@ -719,6 +722,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;
int save_verbose = verbose;
if (filesfrom_fd >= 0) {
-@@ -762,6 +766,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;
}
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
-@@ -770,6 +778,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;
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_
+@@ -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;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -895,11 +907,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;
}