X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ccb16b467b24c4bbbe0cfba3c81025ea0a2bd110..b635bc92d16f538b2ea949580f55c86532d84843:/generator.c

diff --git a/generator.c b/generator.c
index 6a7b9c2b..fb79b2dc 100644
--- a/generator.c
+++ b/generator.c
@@ -27,7 +27,6 @@ extern int verbose;
 extern int dry_run;
 extern int do_xfers;
 extern int log_format_has_i;
-extern int log_format_has_o_or_i;
 extern int daemon_log_format_has_i;
 extern int am_root;
 extern int am_server;
@@ -81,7 +80,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;
@@ -771,8 +769,9 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 			   enum logcode code, int f_out)
 {
 	static int missing_below = -1, excluded_below = -1;
-	static char *fuzzy_dirname = "";
+	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 +789,12 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
 		if (fuzzy_dirlist) {
 			flist_free(fuzzy_dirlist);
 			fuzzy_dirlist = NULL;
-			fuzzy_dirname = "";
 		}
 		if (missing_below >= 0) {
 			dry_run--;
 			missing_below = -1;
 		}
+		parent_dirname = "";
 		return;
 	}
 
@@ -830,18 +829,27 @@ 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 (fuzzy_dirname != dn
-			    && strcmp(fuzzy_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
+			 && do_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;
 			}
-			fuzzy_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",
@@ -1291,6 +1299,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	int save_ignore_non_existing = ignore_non_existing;
 	int save_do_progress = do_progress;
 	int save_make_backups = make_backups;
+	int dir_tweaking = !(list_only || local_name || dry_run);
 
 	if (protocol_version >= 29) {
 		itemizing = 1;
@@ -1352,7 +1361,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 		 * them.  This is then fixed after the transfer is done. */
 #ifdef HAVE_CHMOD
 		if (!am_root && S_ISDIR(file->mode) && !(file->mode & S_IWUSR)
-		    && !list_only) {
+		 && dir_tweaking) {
 			mode_t mode = file->mode | S_IWUSR; /* user write */
 			char *fname = local_name ? local_name : fbuf;
 			if (do_chmod(fname, mode) < 0) {
@@ -1432,8 +1441,7 @@ void generate_files(int f_out, struct file_list *flist, char *local_name)
 	if (delete_after && !local_name && flist->count > 0)
 		do_delete_pass(flist);
 
-	if ((need_retouch_dir_perms || need_retouch_dir_times)
-	    && !list_only && !local_name && !dry_run) {
+	if ((need_retouch_dir_perms || need_retouch_dir_times) && dir_tweaking) {
 		int j = 0;
 		/* Now we need to fix any directory permissions that were
 		 * modified during the transfer and/or re-set any tweaked