X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/ecc81fce17f2e32fbe33c0050693899ce4d6c3cf..89e540e638b29473118535cf9c93da2fc82a43db:/receiver.c

diff --git a/receiver.c b/receiver.c
index 97b12049..eaa2161f 100644
--- a/receiver.c
+++ b/receiver.c
@@ -275,29 +275,31 @@ static int receive_data(int f_in, char *fname_r, int fd_r, OFF_T size_r,
 			sum_update(map,len);
 		}
 
-		if (!inplace || offset != offset2) {
-			if (fd != -1 && write_file(fd, map, len) != (int)len) {
-				rsyserr(FERROR, errno, "write failed on %s",
-					full_fname(fname));
-				exit_cleanup(RERR_FILEIO);
-			}
-		} else {
-			flush_write_file(fd);
-			if (do_lseek(fd,(OFF_T)len,SEEK_CUR) != offset+len) {
-				rprintf(FERROR, "lseek failed on %s: %s, %lli, %lli, %i\n",
-					full_fname(fname), strerror(errno),
-					do_lseek(fd, 0, SEEK_CUR),
-					offset + len, i);
-				exit_cleanup(RERR_FILEIO);
+		if (inplace) {
+			if (offset == offset2 && fd != -1) {
+				flush_write_file(fd);
+				offset += len;
+				if (do_lseek(fd, len, SEEK_CUR) != offset) {
+					rsyserr(FERROR, errno,
+						"lseek failed on %s",
+						full_fname(fname));
+					exit_cleanup(RERR_FILEIO);
+				}
+				continue;
 			}
 		}
+		if (fd != -1 && write_file(fd, map, len) != (int)len) {
+			rsyserr(FERROR, errno, "write failed on %s",
+				full_fname(fname));
+			exit_cleanup(RERR_FILEIO);
+		}
 		offset += len;
 	}
 
 	flush_write_file(fd);
 
 #ifdef HAVE_FTRUNCATE
-	if (inplace)
+	if (inplace && fd != -1)
 		ftruncate(fd, offset);
 #endif