extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -701,6 +702,16 @@ static struct file_struct *receive_file_
+@@ -699,6 +700,16 @@ static struct file_struct *receive_file_
sum = empty_sum;
}
read_buf(f, sum, checksum_len);
return file;
--- old/generator.c
+++ new/generator.c
-@@ -71,6 +71,7 @@ extern int ignore_timeout;
+@@ -73,6 +73,7 @@ extern int ignore_timeout;
extern int protocol_version;
extern int fuzzy_basis;
extern int always_checksum;
extern int checksum_len;
extern char *partial_dir;
extern char *basis_dir[];
-@@ -374,7 +375,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. */
{
if (st->st_size != file->length)
return 0;
-@@ -383,6 +385,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];
file_checksum(fn, sum, st->st_size);
return memcmp(sum, file->u.sum, checksum_len) == 0;
}
-@@ -620,7 +624,7 @@ static int try_dests_reg(struct file_str
+@@ -628,7 +632,7 @@ static int try_dests_reg(struct file_str
match_level = 1;
/* FALL THROUGH */
case 1:
continue;
best_match = j;
match_level = 2;
-@@ -1182,7 +1186,7 @@ static void recv_generator(char *fname,
+@@ -1197,7 +1201,7 @@ static void recv_generator(char *fname,
;
else if (fnamecmp_type == FNAMECMP_FUZZY)
;
extern int recurse;
extern int relative_paths;
extern int sanitize_paths;
-@@ -68,6 +69,7 @@ extern char *batch_name;
-
- extern char curr_dir[MAXPATHLEN];
+@@ -66,6 +67,9 @@ extern char *rsync_path;
+ extern char *shell_cmd;
+ extern char *batch_name;
++extern char curr_dir[MAXPATHLEN];
++
+int pre_checksum = 0;
int local_server = 0;
+ int startdir_depth = 0;
mode_t orig_umask = 0;
- struct file_list *the_file_list;
-@@ -736,6 +738,7 @@ static void do_server_recv(int f_in, int
+@@ -741,6 +745,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) {
-@@ -779,6 +782,10 @@ static void do_server_recv(int f_in, int
+@@ -784,6 +789,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
flist = recv_file_list(f_in);
verbose = save_verbose;
if (!flist) {
-@@ -787,6 +794,9 @@ static void do_server_recv(int f_in, int
+@@ -792,6 +801,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]);
-@@ -848,6 +858,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -851,6 +863,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;
-@@ -922,11 +933,18 @@ int client_run(int f_in, int f_out, pid_
+@@ -925,11 +938,18 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}