X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/acd029924380c8b00f58dabf35275d365c88fdde..34bde8d54af97d339f3cb8d8343566bcdb2a1e5b:/receiver.c

diff --git a/receiver.c b/receiver.c
index a62bc061..3618ed19 100644
--- a/receiver.c
+++ b/receiver.c
@@ -65,10 +65,6 @@ static void delete_one(char *fn, int is_dir)
 			rprintf(FINFO, "deleting %s\n", safe_fname(fn));
 	} else {
 		if (do_rmdir(fn) != 0) {
-			if (errno == ENOTDIR && keep_dirlinks) {
-				delete_one(fn, 0);
-				return;
-			}
 			if (errno != ENOTEMPTY && errno != EEXIST) {
 				rsyserr(FERROR, errno,
 					"delete_one: rmdir %s failed",
@@ -120,22 +116,22 @@ void delete_files(struct file_list *flist)
 			rprintf(FINFO, "deleting in %s\n", safe_fname(fbuf));
 
 		for (i = local_file_list->count-1; i >= 0; i--) {
-			if (max_delete && deletion_count > max_delete)
+			if (max_delete && deletion_count >= max_delete)
 				break;
 			if (!local_file_list->files[i]->basename)
 				continue;
 			if (flist_find(flist,local_file_list->files[i]) < 0) {
 				char *f = f_name(local_file_list->files[i]);
-				if (make_backups && (backup_dir || !is_backup_file(f))) {
+				int mode = local_file_list->files[i]->mode;
+				if (make_backups && (backup_dir || !is_backup_file(f))
+				  && !S_ISDIR(mode)) {
 					make_backup(f);
 					if (verbose) {
 						rprintf(FINFO, "deleting %s\n",
 							safe_fname(f));
 					}
-				} else {
-					int mode = local_file_list->files[i]->mode;
+				} else
 					delete_one(f, S_ISDIR(mode) != 0);
-				}
 				deletion_count++;
 			}
 		}
@@ -222,7 +218,8 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 	read_sum_head(f_in, &sum);
 
 	if (fd_r >= 0 && size_r > 0) {
-		mapbuf = map_file(fd_r, size_r, sum.blength);
+		OFF_T map_size = MAX(sum.blength * 2, 16*1024);
+		mapbuf = map_file(fd_r, size_r, map_size, sum.blength);
 		if (verbose > 2) {
 			rprintf(FINFO, "recv mapped %s of size %.0f\n",
 				safe_fname(fname_r), (double)size_r);
@@ -437,6 +434,11 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
 		} else
 			fnamecmp = partialptr = fname;
 
+		if (inplace && make_backups) {
+			if (!(fnamecmp = get_backup_name(fname)))
+				fnamecmp = partialptr;
+		}
+
 		/* open the file */
 		fd1 = do_open(fnamecmp, O_RDONLY, 0);
 
@@ -488,10 +490,10 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
 
 		/* We now check to see if we are writing file "inplace" */
 		if (inplace)  {
-			fd2 = do_open(fnamecmp, O_WRONLY|O_CREAT, 0);
+			fd2 = do_open(fname, O_WRONLY|O_CREAT, 0);
 			if (fd2 == -1) {
 				rsyserr(FERROR, errno, "open %s failed",
-					full_fname(fnamecmp));
+					full_fname(fname));
 				discard_receive_data(f_in, file->length);
 				if (fd1 != -1)
 					close(fd1);