From: Vsevolod Stakhov Date: Fri, 28 Aug 2015 14:58:55 +0000 (+0100) Subject: Fix extended output. X-Git-Tag: 1.0.0~141 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=83098d8daeb7444f14df39b3b4b29e13d56fdd0b;p=thirdparty%2Frspamd.git Fix extended output. --- diff --git a/src/libutil/logger.c b/src/libutil/logger.c index 9adf389b8d..b180b9dc55 100644 --- a/src/libutil/logger.c +++ b/src/libutil/logger.c @@ -749,20 +749,25 @@ file_log_function (const gchar *log_domain, } if (function != NULL) { mr = rspamd_snprintf (m, mremain, "%s: ", function); + m += mr; + mremain -= mr; } else { mr = rspamd_snprintf (m, mremain, ": ", function); + m += mr; + mremain -= mr; } /* Construct IOV for log line */ iov[0].iov_base = tmpbuf; iov[0].iov_len = r; iov[1].iov_base = modulebuf; - iov[1].iov_len = mr; + iov[1].iov_len = m - modulebuf; iov[2].iov_base = (void *) message; iov[2].iov_len = mlen; iov[3].iov_base = (void *) &lf_chr; iov[3].iov_len = 1; + if (rspamd_log->cfg->log_color) { iov[4].iov_base = "\033[0m"; iov[4].iov_len = sizeof ("\033[0m") - 1;