X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1f8413449dc6430e59b7383c25454de72503f007..0503f06089b89aa4166d6ced8d5901ad6a112c41:/receiver.c

diff --git a/receiver.c b/receiver.c
index 816d69fd..6361d21b 100644
--- a/receiver.c
+++ b/receiver.c
@@ -417,8 +417,10 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
 			      file->mode & INITACCESSPERMS);
 
-		if (fd2 == -1 && errno == ENOENT && 
-		    (relative_paths || (compare_dest != NULL)) &&
+		/* in most cases parent directories will already exist
+		   because their information should have been previously
+		   transferred, but that may not be the case with -R */
+		if (fd2 == -1 && relative_paths && errno == ENOENT && 
 		    create_directory_path(fnametmp) == 0) {
 			fd2 = do_open(fnametmp,O_WRONLY|O_CREAT|O_EXCL,
 				      file->mode & INITACCESSPERMS);
@@ -475,7 +477,7 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 	for (i = 0; i < flist->count; i++) {
 		file = flist->files[i];
 		if (!file->basename || !S_ISDIR(file->mode)) continue;
-		recv_generator(f_name(file),flist,i,-1);
+		recv_generator(local_name?local_name:f_name(file),flist,i,-1);
 	}
 
 	if (verbose > 2)