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

diff --git a/log.c b/log.c
index d4cce69f..f2df6000 100644
--- a/log.c
+++ b/log.c
@@ -218,18 +218,21 @@ void rwrite(enum logcode code, char *buf, int len)
 	int trailing_CR_or_NL;
 	FILE *f = NULL;
 
-	if (quiet && code == FINFO)
-		return;
-
 	if (len < 0)
 		exit_cleanup(RERR_MESSAGEIO);
 
+	if (quiet && code == FINFO)
+		return;
+
 	if (am_server && msg_fd_out >= 0) {
 		/* Pass the message to our sibling. */
 		send_msg((enum msgcode)code, buf, len);
 		return;
 	}
 
+	if (code == FSOCKERR) /* This gets simplified for a non-sibling. */
+		code = FERROR;
+
 	if (code == FCLIENT)
 		code = FINFO;
 	else if (am_daemon) {
@@ -536,6 +539,7 @@ static void log_formatted(enum logcode code, char *format, char *op,
 			     : !(iflags & ITEM_TRANSFER) ? '.'
 			     : !local_server && *op == 's' ? '<' : '>';
 			n[1] = S_ISDIR(file->mode) ? 'd'
+			     : IS_SPECIAL(file->mode) ? 'S'
 			     : IS_DEVICE(file->mode) ? 'D'
 			     : S_ISLNK(file->mode) ? 'L' : 'f';
 			n[2] = !(iflags & ITEM_REPORT_CHECKSUM) ? '.' : 'c';