extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -699,6 +700,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);
return file;
--- old/generator.c
+++ new/generator.c
-@@ -73,6 +73,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;
file_checksum(fn, sum, st->st_size);
return memcmp(sum, file->u.sum, checksum_len) == 0;
}
-@@ -628,7 +632,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:
continue;
best_match = j;
match_level = 2;
-@@ -1197,7 +1201,7 @@ static void recv_generator(char *fname,
+@@ -1212,7 +1216,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
-@@ -212,7 +212,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))
extern int recurse;
extern int relative_paths;
extern int sanitize_paths;
-@@ -66,6 +67,9 @@ extern char *rsync_path;
- extern char *shell_cmd;
- extern char *batch_name;
+@@ -71,6 +72,9 @@ extern char *batch_name;
+ extern char curr_dir[MAXPATHLEN];
+ extern struct filter_list_struct server_filter_list;
+extern char curr_dir[MAXPATHLEN];
+
+int pre_checksum = 0;
int local_server = 0;
- int startdir_depth = 0;
+ int new_root_dir = 0;
mode_t orig_umask = 0;
-@@ -741,6 +745,7 @@ static void do_server_recv(int f_in, int
+@@ -784,6 +788,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) {
-@@ -784,6 +789,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) {
-@@ -792,6 +801,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;
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -851,6 +863,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;
char *local_name = NULL;
cleanup_child_pid = pid;
-@@ -925,11 +938,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);
--- 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