X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4366d2c42853a88ce7cef62e2cb22d314607cf69..f5db09933011a8b4014336a09ece12690d8ba280:/rsync.c

diff --git a/rsync.c b/rsync.c
index 1ddb54f3..89fe6f3e 100644
--- a/rsync.c
+++ b/rsync.c
@@ -27,6 +27,7 @@ extern int dry_run;
 extern int preserve_times;
 extern int omit_dir_times;
 extern int am_root;
+extern int am_server;
 extern int am_sender;
 extern int am_generator;
 extern int preserve_uid;
@@ -122,9 +123,10 @@ int delete_file(char *fname, int flags)
 		else
 			flags &= ~DEL_DIR;
 
-		if (verbose)
+		if (verbose) {
 			rprintf(FINFO, "deleting %s%s\n", safe_fname(buf),
 				flags & DEL_DIR ? "/" : "");
+		}
 		if (delete_file(buf, flags) != 0) {
 			closedir(d);
 			return -1;
@@ -192,13 +194,15 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		if (verbose > 2) {
 			if (change_uid) {
 				rprintf(FINFO,
-				    "set uid of %s from %ld to %ld\n",
-				    fname, (long)st->st_uid, (long)file->uid);
+					"set uid of %s from %ld to %ld\n",
+					safe_fname(fname),
+					(long)st->st_uid, (long)file->uid);
 			}
 			if (change_gid) {
 				rprintf(FINFO,
-				    "set gid of %s from %ld to %ld\n",
-				    fname, (long)st->st_gid, (long)file->gid);
+					"set gid of %s from %ld to %ld\n",
+					safe_fname(fname),
+					(long)st->st_gid, (long)file->gid);
 			}
 		}
 		if (do_lchown(fname,
@@ -221,7 +225,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 		updated = 1;
 	}
 
-#ifdef HAVE_CHMOD
+#if HAVE_CHMOD
 	if (!S_ISLNK(st->st_mode)) {
 		if ((st->st_mode & CHMOD_BITS) != (file->mode & CHMOD_BITS)) {
 			updated = 1;
@@ -236,9 +240,9 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
 
 	if (verbose > 1 && flags & PERMS_REPORT) {
 		if (updated)
-			rprintf(FINFO,"%s\n",fname);
+			rprintf(FINFO, "%s\n", safe_fname(fname));
 		else
-			rprintf(FINFO,"%s is uptodate\n",fname);
+			rprintf(FINFO, "%s is uptodate\n", safe_fname(fname));
 	}
 	return updated;
 }
@@ -268,7 +272,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 	if (inplace) {
 		if (verbose > 2)
-			rprintf(FINFO, "finishing %s\n", fname);
+			rprintf(FINFO, "finishing %s\n", safe_fname(fname));
 		goto do_set_perms;
 	}
 
@@ -279,13 +283,15 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 	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);
+	if (verbose > 2) {
+		rprintf(FINFO, "renaming %s to %s\n",
+			safe_fname(fnametmp), safe_fname(fname));
+	}
 	ret = robust_rename(fnametmp, fname, file->mode & INITACCESSPERMS);
 	if (ret < 0) {
 		rsyserr(FERROR, errno, "%s %s -> \"%s\"",
 		    ret == -2 ? "copy" : "rename",
-		    full_fname(fnametmp), fname);
+		    full_fname(fnametmp), safe_fname(fname));
 		do_unlink(fnametmp);
 		return;
 	}
@@ -299,5 +305,7 @@ void finish_transfer(char *fname, char *fnametmp, struct file_struct *file,
 
 const char *who_am_i(void)
 {
+	if (am_sender < 0)
+		return am_server ? "server" : "client";
 	return am_sender ? "sender" : am_generator ? "generator" : "receiver";
 }