From 9d954dca8c17732f4d4cdc48218d02c20795622a Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Fri, 14 Jan 2005 18:20:46 +0000
Subject: [PATCH] Make sure that the presence of a partial-dir file is noted,
 even if --whole-file is in effect.  Also needed to force statret to 0 when
 using a partial-dir file.

---
 generator.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/generator.c b/generator.c
index ce93b5ad..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);
 
-- 
2.34.1