X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a3221d2ac14255c31109a617c4d62b949cd910de..bb6721dce6bac8ff2374609bf5f99ea7e6fe2c70:/rsync.c

diff --git a/rsync.c b/rsync.c
index 7a1c3f93..e46d0861 100644
--- a/rsync.c
+++ b/rsync.c
@@ -98,7 +98,7 @@ int delete_file(char *fname)
 			continue;
 		pathjoin(buf, sizeof buf, fname, dname);
 		if (verbose > 0)
-			rprintf(FINFO, "deleting %s\n", buf);
+			rprintf(FINFO, "deleting %s\n", safe_fname(buf));
 		if (delete_file(buf) != 0) {
 			closedir(d);
 			return -1;
@@ -243,8 +243,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 	if (inplace) {
 		if (verbose > 2)
 			rprintf(FINFO, "finishing %s\n", fname);
-		set_perms(fname, file, NULL, 0);
-		return;
+		goto do_set_perms;
 	}
 
 	/* move tmp file over real file */
@@ -256,10 +255,10 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 		    ret == -2 ? "copy" : "rename",
 		    full_fname(fnametmp), fname);
 		do_unlink(fnametmp);
-	} else {
-		set_perms(fname, file, NULL,
-			  ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
+		return;
 	}
+    do_set_perms:
+	set_perms(fname, file, NULL, ok_to_set_time ? 0 : PERMS_SKIP_MTIME);
 }
 
 const char *who_am_i(void)