From: Wayne Davison <wayned@samba.org>
Date: Tue, 7 Sep 2004 21:34:26 +0000 (+0000)
Subject: If we're making backups with --inplace, use the backup file as the
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/dc55d7bdabb5a5d5c8cc97794171b485e4f75f19

If we're making backups with --inplace, use the backup file as the
basis file while still updating the real destination file inplace.
---

diff --git a/receiver.c b/receiver.c
index 9e40fcbf..7b86938d 100644
--- a/receiver.c
+++ b/receiver.c
@@ -438,6 +438,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);
 
@@ -489,10 +494,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);