--- old/flist.c
+++ new/flist.c
-@@ -34,6 +34,7 @@ extern int am_generator;
+@@ -33,6 +33,7 @@ extern int am_generator;
extern int inc_recurse;
extern int do_progress;
extern int always_checksum;
extern int module_id;
extern int ignore_errors;
extern int numeric_ids;
-@@ -948,6 +949,15 @@ static struct file_struct *recv_file_ent
+@@ -955,6 +956,15 @@ static struct file_struct *recv_file_ent
memcpy(bp, F_SUM(first), checksum_len);
} else
read_buf(f, bp, checksum_len);
#ifdef SUPPORT_ACLS
--- old/generator.c
+++ new/generator.c
-@@ -74,6 +74,7 @@ extern int protocol_version;
+@@ -73,6 +73,7 @@ extern int protocol_version;
extern int file_total;
extern int fuzzy_basis;
extern int always_checksum;
continue;
best_match = j;
match_level = 2;
-@@ -1559,7 +1563,7 @@ static void recv_generator(char *fname,
+@@ -1575,7 +1579,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
-@@ -393,7 +393,7 @@ int hard_link_check(struct file_struct *
+@@ -392,7 +392,7 @@ int hard_link_check(struct file_struct *
}
break;
}
if (unchanged_attrs(cmpbuf, file, &alt_sx))
--- old/main.c
+++ new/main.c
-@@ -46,6 +46,7 @@ extern int module_id;
+@@ -45,6 +45,7 @@ extern int module_id;
extern int copy_links;
extern int copy_dirlinks;
extern int keep_dirlinks;
extern int preserve_hard_links;
extern int protocol_version;
extern int file_total;
-@@ -73,6 +74,9 @@ extern char *password_file;
+@@ -72,6 +73,9 @@ extern char *password_file;
extern char curr_dir[MAXPATHLEN];
extern struct filter_list_struct server_filter_list;
int local_server = 0;
int new_root_dir = 0;
mode_t orig_umask = 0;
-@@ -793,6 +797,7 @@ static void do_server_recv(int f_in, int
+@@ -792,6 +796,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) {
-@@ -839,6 +844,10 @@ static void do_server_recv(int f_in, int
+@@ -838,6 +843,10 @@ static void do_server_recv(int f_in, int
filesfrom_fd = -1;
}
flist = recv_file_list(f_in);
if (!flist) {
rprintf(FERROR,"server_recv: recv_file_list error\n");
-@@ -848,6 +857,9 @@ static void do_server_recv(int f_in, int
+@@ -847,6 +856,9 @@ static void do_server_recv(int f_in, int
recv_additional_file_list(f_in);
verbose = save_verbose;
if (argc > 0)
local_name = get_local_name(flist,argv[0]);
-@@ -927,6 +939,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -926,6 +938,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;
-@@ -1007,12 +1020,19 @@ int client_run(int f_in, int f_out, pid_
+@@ -1006,12 +1019,19 @@ int client_run(int f_in, int f_out, pid_
filesfrom_fd = -1;
}
+ if (pre_checksum)
+ pop_dir(olddir);
+
- if (flist && flist->count > 0) {
+ if (flist && flist->used > 0) {
local_name = get_local_name(flist, argv[0]);
--- old/rsync.h
+++ new/rsync.h
-@@ -72,6 +72,7 @@
+@@ -71,6 +71,7 @@
#define FLAG_HLINK_DONE (1<<8) /* receiver/generator */
#define FLAG_LENGTH64 (1<<9) /* sender/receiver/generator */
#define FLAG_SKIP_GROUP (1<<10) /* receiver/generator */