X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/81b07870c8d1b69a594694898111f6c7af6ea419..7aac6604c4642b93b619ac03c56e9877437bcce3:/rsync.c

diff --git a/rsync.c b/rsync.c
index 48aa610d..47b49a6f 100644
--- a/rsync.c
+++ b/rsync.c
@@ -239,15 +239,18 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 {
 	int ret;
 
-	if (make_backups && !make_backup(fname))
-		return;
-
 	if (inplace) {
 		if (verbose > 2)
 			rprintf(FINFO, "finishing %s\n", fname);
 		goto do_set_perms;
 	}
 
+	if (make_backups && !make_backup(fname))
+		return;
+
+	/* Change permissions before putting the file into place. */
+	set_perms(fnametmp, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
+
 	/* move tmp file over real file */
 	if (verbose > 2)
 		rprintf(FINFO, "renaming %s to %s\n", fnametmp, fname);
@@ -259,11 +262,15 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 		do_unlink(fnametmp);
 		return;
 	}
+	if (ret == 0) {
+		/* The file was moved into place (not copied), so it's done. */
+		return;
+	}
     do_set_perms:
 	set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 }
 
 const char *who_am_i(void)
 {
-    return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+	return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 }