X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a9cc1283089c07f87e986cf3837c096c3f8462c7..904e5af12874694c47b7ccf7b8b2e6aa883cab0f:/generator.c

diff --git a/generator.c b/generator.c
index c0e876a3..c5facb7c 100644
--- a/generator.c
+++ b/generator.c
@@ -81,7 +81,6 @@ extern int link_dest;
 extern int whole_file;
 extern int list_only;
 extern int read_batch;
-extern int orig_umask;
 extern int safe_symlinks;
 extern long block_size; /* "long" because popt can't set an int32. */
 extern int max_delete;
@@ -773,6 +772,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 	static int missing_below = -1, excluded_below = -1;
 	static char *parent_dirname = "";
 	static struct file_list *fuzzy_dirlist = NULL;
+	static int need_fuzzy_dirlist = 0;
 	struct file_struct *fuzzy_file = NULL;
 	int fd = -1, f_copy = -1;
 	STRUCT_STAT st, real_st, partial_st;
@@ -790,12 +790,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
 			fuzzy_dirlist = NULL;
-			parent_dirname = "";
 		}
 		if (missing_below >= 0) {
 			dry_run--;
 			missing_below = -1;
 		}
+		parent_dirname = "";
 		return;
 	}
 
@@ -830,18 +830,26 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		statret = -1;
 		stat_errno = ENOENT;
 	} else {
-		if (fuzzy_basis && S_ISREG(file->mode)) {
-			char *dn = file->dirname ? file->dirname : ".";
-			if (parent_dirname != dn
-			    && strcmp(parent_dirname, dn) != 0) {
-				if (fuzzy_dirlist)
-					flist_free(fuzzy_dirlist);
-				if (implied_dirs || stat(dn, &st) == 0)
-					fuzzy_dirlist = get_dirlist(dn, -1, 1);
-				else
-					fuzzy_dirlist = NULL;
+		char *dn = file->dirname ? file->dirname : ".";
+		if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
+			if (relative_paths && !implied_dirs && stat(dn, &st) < 0
+			 && create_directory_path(fname) < 0) {
+				rsyserr(FERROR, errno,
+					"recv_generator: mkdir %s failed",
+					full_fname(dn));
+			}
+			if (fuzzy_dirlist) {
+				flist_free(fuzzy_dirlist);
+				fuzzy_dirlist = NULL;
 			}
-			parent_dirname = dn;
+			if (fuzzy_basis)
+				need_fuzzy_dirlist = 1;
+		}
+		parent_dirname = dn;
+
+		if (need_fuzzy_dirlist && S_ISREG(file->mode)) {
+			fuzzy_dirlist = get_dirlist(dn, -1, 1);
+			need_fuzzy_dirlist = 0;
 		}
 
 		statret = link_stat(fname, &st,
@@ -887,7 +895,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		}
 		if (statret != 0 && do_mkdir(fname,file->mode) < 0 && errno != EEXIST) {
 			if (!relative_paths || errno != ENOENT
-			    || create_directory_path(fname, orig_umask) < 0
+			    || create_directory_path(fname) < 0
 			    || (do_mkdir(fname, file->mode) < 0 && errno != EEXIST)) {
 				rsyserr(FERROR, errno,
 					"recv_generator: mkdir %s failed",