1 files changed, 6 insertions, 17 deletions

diff --git a/log.c b/log.c
index 45affca13..70bfcfd34 100644
--- a/log.c
+++ b/log.c
@@ -34,15 +34,12 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: log.c,v 1.28 2003/05/24 09:02:22 djm Exp $");
+RCSID("$OpenBSD: log.c,v 1.25 2003/01/11 18:29:43 markus Exp $");
 
 #include "log.h"
 #include "xmalloc.h"
 
 #include <syslog.h>
-#if defined(HAVE_STRNVIS) && defined(HAVE_VIS_H)
-# include <vis.h>
-#endif
 
 static LogLevel log_level = SYSLOG_LEVEL_INFO;
 static int log_on_stderr = 1;
@@ -131,7 +128,7 @@ error(const char *fmt,...)
 /* Log this message (information that usually should go to the log). */
 
 void
-logit(const char *fmt,...)
+log(const char *fmt,...)
 {
         va_list args;
 
@@ -344,9 +341,6 @@ log_init(char *av0, LogLevel level, SyslogFacility facility, int on_stderr)
 void
 do_log(LogLevel level, const char *fmt, va_list args)
 {
-#ifdef OPENLOG_R
-        struct syslog_data sdata = SYSLOG_DATA_INIT;
-#endif
         char msgbuf[MSGBUFSIZ];
         char fmtbuf[MSGBUFSIZ];
         char *txt = NULL;
@@ -395,19 +389,14 @@ 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);
+        /* Escape magic chars in output. */
+        strnvis(fmtbuf, msgbuf, sizeof(fmtbuf), VIS_OCTAL);
+        
         if (log_on_stderr) {
-                snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
-                write(STDERR_FILENO, msgbuf, strlen(msgbuf));
+                fprintf(stderr, "%s\r\n", fmtbuf);
         } else {
-#ifdef OPENLOG_R
-                openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
-                syslog_r(pri, &sdata, "%.500s", fmtbuf);
-                closelog_r(&sdata);
-#else
                 openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
                 syslog(pri, "%.500s", fmtbuf);
                 closelog();
-#endif
         }
 }