X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/63ecee4d1ae76134d3ebd6272d2157f059b2cab6..93c31c1a6d1016924acea01791d6453de75063b6:/log.c

diff --git a/log.c b/log.c
index 6d969193..9d915c39 100644
--- a/log.c
+++ b/log.c
@@ -375,8 +375,8 @@ static void log_formatted(enum logcode code,
 		case 'o': n = op; break;
 		case 'f':
 			pathjoin(buf2, sizeof buf2,
-				 file->basedir ? file->basedir : "",
-				 f_name(file));
+			    am_sender && file->dir.root ? file->dir.root : "",
+			    safe_fname(f_name(file)));
 			clean_fname(buf2, 0);
 			n = buf2;
 			if (*n == '/') n++;
@@ -418,7 +418,8 @@ static void log_formatted(enum logcode code,
 		l = strlen(n);
 
 		if (l + ((int)(s - &buf[0])) >= sizeof(buf)) {
-			rprintf(FERROR,"buffer overflow expanding %%%c - exiting\n",
+			rprintf(FERROR,
+				"buffer overflow expanding %%%c -- exiting\n",
 				p[0]);
 			exit_cleanup(RERR_MESSAGEIO);
 		}
@@ -428,7 +429,7 @@ static void log_formatted(enum logcode code,
 			memmove(s+(l-1), s+1, strlen(s+1)+1);
 		}
 
-		/* Copy in n but NOT its nul, because the format sting
+		/* Copy in n but NOT its nul, because the format string
 		 * probably continues after this. */
 		memcpy(p, n, l);