X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a7260c403733b10e3d25abf334441f3ed4cc3b91..9f004a9ea97dd456dced1c4607da76924aa47870:/receiver.c

diff --git a/receiver.c b/receiver.c
index 1118beb7..3ce55286 100644
--- a/receiver.c
+++ b/receiver.c
@@ -22,7 +22,6 @@
 
 extern int verbose;
 extern int recurse;
-extern int delete_mode;
 extern int delete_after;
 extern int max_delete;
 extern int csum_length;
@@ -66,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",
@@ -223,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);
@@ -426,13 +422,8 @@ int recv_files(int f_in, struct file_list *flist, char *local_name)
 		if (server_exclude_list.head
 		    && check_exclude(&server_exclude_list, fname,
 				     S_ISDIR(file->mode)) < 0) {
-			if (verbose) {
-				rprintf(FINFO,
-					"skipping server-excluded update for \"%s\"\n",
-					safe_fname(fname));
-			}
-			discard_receive_data(f_in, file->length);
-			continue;
+			rprintf(FERROR, "attempt to hack rsync failed.\n");
+			exit_cleanup(RERR_PROTOCOL);
 		}
 
 		if (partial_dir) {
@@ -443,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);
 
@@ -494,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);