X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a255c592e8fa9e4570ebbf333e95a402f9e84a03..12a79db2f618d0776c53c54d30149138f6aa1c0a:/generator.c

diff --git a/generator.c b/generator.c
index c3ba30ce..e9e47ac6 100644
--- a/generator.c
+++ b/generator.c
@@ -485,7 +485,7 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 		stat_errno = ENOENT;
 	}
 
-	if (partial_dir && (partialptr = partial_dir_fname(fname))
+	if (partial_dir && (partialptr = partial_dir_fname(fname)) != NULL
 	    && link_stat(partialptr, &partial_st, 0) == 0
 	    && S_ISREG(partial_st.st_mode)) {
 		if (statret == -1)
@@ -528,6 +528,13 @@ static void recv_generator(char *fname, struct file_struct *file, int i,
 	}
 
 prepare_to_open:
+	if (partialptr) {
+		st = partial_st;
+		fnamecmp = partialptr;
+		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
+		statret = 0;
+	}
+
 	if (dry_run || whole_file > 0) {
 		statret = -1;
 		goto notify_others;
@@ -535,12 +542,6 @@ prepare_to_open:
 	if (read_batch)
 		goto notify_others;
 
-	if (partialptr) {
-		st = partial_st;
-		fnamecmp = partialptr;
-		fnamecmp_type = FNAMECMP_PARTIAL_DIR;
-	}
-
 	/* open the file */
 	fd = do_open(fnamecmp, O_RDONLY, 0);
 
@@ -685,6 +686,9 @@ void generate_files(int f_out, struct file_list *flist, char *local_name,
 
 	write_int(f_out, -1);
 
+	/* Read post-redo-phase MSG_DONE and any prior messages. */
+	get_redo_num();
+
 	if (preserve_hard_links)
 		do_hard_links();