X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a644fc3cc40cb49296a078a7b55b146bf2871f9b..4ce48a5bfdc975546dd4b0f17d029a7f5be9cad7:/log.c

diff --git a/log.c b/log.c
index 3f8fd53b..f7e124f3 100644
--- a/log.c
+++ b/log.c
@@ -182,7 +182,8 @@ void rwrite(enum logcode code, char *buf, int len)
 			send_msg((enum msgcode)code, buf, len);
 			return;
 		}
-		if (io_multiplex_write((enum msgcode)code, buf, len))
+		if (!am_daemon
+		    && io_multiplex_write((enum msgcode)code, buf, len))
 			return;
 	}
 
@@ -385,8 +386,8 @@ static void log_formatted(enum logcode code,
 			break;
 		case 'o': n = op; break;
 		case 'f':
-			snprintf(buf2, sizeof(buf2), "%s/%s",
-				 file->basedir?file->basedir:"",
+			pathjoin(buf2, sizeof buf2,
+				 file->basedir ? file->basedir : "",
 				 f_name(file));
 			clean_fname(buf2);
 			n = buf2;