From 23a7027e48c1b8d7f54c04319a6e0433d1c19e23 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 21 Jul 2004 10:52:13 +1000 Subject: - (djm) [log.c] bz #111: Escape more control characters when sending data to syslog; from peak AT argo.troja.mff.cuni.cz --- log.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'log.c') diff --git a/log.c b/log.c index 0c4d5123..5d8625d1 100644 --- a/log.c +++ b/log.c @@ -51,6 +51,9 @@ static char *argv0; extern char *__progname; +#define LOG_SYSLOG_VIS (VIS_CSTYLE|VIS_NL|VIS_TAB|VIS_OCTAL) +#define LOG_STDERR_VIS (VIS_SAFE|VIS_OCTAL) + /* textual representation of log-facilities/levels */ static struct { @@ -316,7 +319,8 @@ do_log(LogLevel level, const char *fmt, va_list args) } else { vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); } - strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL); + strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), + log_on_stderr ? LOG_STDERR_VIS : LOG_SYSLOG_VIS); if (log_on_stderr) { snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); write(STDERR_FILENO, msgbuf, strlen(msgbuf)); -- cgit v1.2.3