diff options
Diffstat (limited to 'log.c')
-rw-r--r-- | log.c | 11 |
1 files changed, 5 insertions, 6 deletions
@@ -34,12 +34,13 @@ | |||
34 | */ | 34 | */ |
35 | 35 | ||
36 | #include "includes.h" | 36 | #include "includes.h" |
37 | RCSID("$OpenBSD: log.c,v 1.27 2003/05/18 23:22:01 deraadt Exp $"); | 37 | RCSID("$OpenBSD: log.c,v 1.28 2003/05/24 09:02:22 djm Exp $"); |
38 | 38 | ||
39 | #include "log.h" | 39 | #include "log.h" |
40 | #include "xmalloc.h" | 40 | #include "xmalloc.h" |
41 | 41 | ||
42 | #include <syslog.h> | 42 | #include <syslog.h> |
43 | #include <vis.h> | ||
43 | 44 | ||
44 | static LogLevel log_level = SYSLOG_LEVEL_INFO; | 45 | static LogLevel log_level = SYSLOG_LEVEL_INFO; |
45 | static int log_on_stderr = 1; | 46 | static int log_on_stderr = 1; |
@@ -390,16 +391,14 @@ do_log(LogLevel level, const char *fmt, va_list args) | |||
390 | } else { | 391 | } else { |
391 | vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); | 392 | vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); |
392 | } | 393 | } |
393 | /* Escape magic chars in output. */ | ||
394 | strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL); | 394 | strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_SAFE|VIS_OCTAL); |
395 | |||
396 | if (log_on_stderr) { | 395 | if (log_on_stderr) { |
397 | snprintf(fmtbuf, sizeof fmtbuf, "%s\r\n", msgbuf); | 396 | snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf); |
398 | write(STDERR_FILENO, fmtbuf, strlen(fmtbuf)); | 397 | write(STDERR_FILENO, msgbuf, strlen(msgbuf)); |
399 | } else { | 398 | } else { |
400 | #ifdef OPENLOG_R | 399 | #ifdef OPENLOG_R |
401 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); | 400 | openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata); |
402 | syslog_r(pri, &sdata, "%.500s", msgbuf); | 401 | syslog_r(pri, &sdata, "%.500s", fmtbuf); |
403 | closelog_r(&sdata); | 402 | closelog_r(&sdata); |
404 | #else | 403 | #else |
405 | openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); | 404 | openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); |