From: Wayne Davison <wayned@samba.org>
Date: Sun, 14 May 2006 00:27:33 +0000 (+0000)
Subject: Make --quiet quieter (like it used to be), but also don't allow it
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/b3e8e7c79e5d1fb33556ea3cb9cf9830085c22a5

Make --quiet quieter (like it used to be), but also don't allow it
to interfere with any logging of messages that is going on.
---

diff --git a/log.c b/log.c
index f62a8cfe..139f0025 100644
--- a/log.c
+++ b/log.c
@@ -224,9 +224,6 @@ void rwrite(enum logcode code, char *buf, int len)
 	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);
@@ -258,6 +255,9 @@ void rwrite(enum logcode code, char *buf, int len)
 	} else if (code == FLOG)
 		return;
 
+	if (quiet && code != FERROR)
+		return;
+
 	if (am_server) {
 		/* Pass the message to the non-server side. */
 		if (send_msg((enum msgcode)code, buf, len))