X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/68a94ac30f3f62cbf2447f5e69bd3b72d6bec300..06b96ffa861132da3545c7c7cf3a0fa150b70c9e:/receiver.c

diff --git a/receiver.c b/receiver.c
index b6d30c02..2f4bc7aa 100644
--- a/receiver.c
+++ b/receiver.c
@@ -123,7 +123,8 @@ static int get_tmpname(char *fnametmp, char *fname)
 	maxname = MIN(MAXPATHLEN - 7 - length, NAME_MAX - 8);
 
 	if (maxname < 1) {
-		rprintf(FERROR, "temporary filename too long: %s\n", fname);
+		rprintf(FERROR, "temporary filename too long: %s\n",
+			safe_fname(fname));
 		fnametmp[0] = '\0';
 		return 0;
 	}
@@ -227,7 +228,7 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 	if (flush_write_file(fd) < 0)
 		goto report_write_error;
 
-#if HAVE_FTRUNCATE
+#ifdef HAVE_FTRUNCATE
 	if (inplace && fd != -1)
 		ftruncate(fd, offset);
 #endif
@@ -513,7 +514,7 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 			exit_cleanup(RERR_FILEIO);
 		}
 
-		if ((recv_ok && !delay_updates) || inplace) {
+		if ((recv_ok && (!delay_updates || !partialptr)) || inplace) {
 			finish_transfer(fname, fnametmp, file, recv_ok, 1);
 			if (partialptr != fname && fnamecmp == partialptr) {
 				do_unlink(partialptr);
@@ -577,12 +578,14 @@ int recv_files(int f_in, struct file_list *flist, char *local_name,
 					continue;
 				if (verbose > 2) {
 					rprintf(FINFO, "renaming %s to %s\n",
-						partialptr, fname);
+						safe_fname(partialptr),
+						safe_fname(fname));
 				}
 				if (do_rename(partialptr, fname) < 0) {
 					rsyserr(FERROR, errno,
 						"rename failed for %s (from %s)",
-						fname, partialptr);
+						full_fname(fname),
+						safe_fname(partialptr));
 				} else {
 					handle_partial_dir(partialptr,
 							   PDIR_DELETE);