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

diff --git a/receiver.c b/receiver.c
index 816d69fd..49d1bf22 100644
--- a/receiver.c
+++ b/receiver.c
@@ -109,11 +109,12 @@ static void delete_files(struct file_list *flist)
 	struct file_list *local_file_list;
 	int i, j;
 	char *name;
+	extern int module_id;
 
 	if (cvs_exclude)
 		add_cvs_excludes();
 
-	if (io_error) {
+	if (io_error && !lp_ignore_errors(module_id)) {
 		rprintf(FINFO,"IO error encountered - skipping file deletion\n");
 		return;
 	}
@@ -358,14 +359,14 @@ int recv_files(int f_in,struct file_list *flist,char *local_name,int f_gen)
 		fnamecmp = fname;
 
 		/* open the file */  
-		fd1 = open(fnamecmp,O_RDONLY);
+		fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
 		if ((fd1 == -1) && (compare_dest != NULL)) {
 			/* try the file at compare_dest instead */
 			slprintf(fnamecmpbuf,MAXPATHLEN,"%s/%s",
 						compare_dest,fname);
 			fnamecmp = fnamecmpbuf;
-			fd1 = open(fnamecmp,O_RDONLY);
+			fd1 = do_open(fnamecmp, O_RDONLY, 0);
 		}
 
 		if (fd1 != -1 && do_fstat(fd1,&st) != 0) {
@@ -417,8 +418,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 +478,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)