[src/trunk]: src/crypto/external/bsd/openssh/dist Avoid using non-literal for...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/eec90d7cac7f
branches:  trunk
changeset: 768717:eec90d7cac7f
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu Aug 25 15:37:00 2011 +0000

description:
Avoid using non-literal format strings and optimizing code a bit at the
same time.

diffstat:

 crypto/external/bsd/openssh/dist/log.c |  38 ++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 13 deletions(-)

diffs (76 lines):

diff -r 9e21aa54ecea -r eec90d7cac7f crypto/external/bsd/openssh/dist/log.c
--- a/crypto/external/bsd/openssh/dist/log.c    Thu Aug 25 15:34:05 2011 +0000
+++ b/crypto/external/bsd/openssh/dist/log.c    Thu Aug 25 15:37:00 2011 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: log.c,v 1.3 2011/07/25 03:03:10 christos Exp $ */
+/*     $NetBSD: log.c,v 1.4 2011/08/25 15:37:00 joerg Exp $    */
 /* $OpenBSD: log.c,v 1.41 2008/06/10 04:50:25 dtucker Exp $ */
 /*
  * Author: Tatu Ylonen <ylo%cs.hut.fi@localhost>
@@ -36,8 +36,9 @@
  */
 
 #include "includes.h"
-__RCSID("$NetBSD: log.c,v 1.3 2011/07/25 03:03:10 christos Exp $");
+__RCSID("$NetBSD: log.c,v 1.4 2011/08/25 15:37:00 joerg Exp $");
 #include <sys/types.h>
+#include <sys/uio.h>
 
 #include <stdarg.h>
 #include <stdio.h>
@@ -302,8 +303,10 @@
 #ifdef SYSLOG_DATA_INIT
        struct syslog_data sdata = SYSLOG_DATA_INIT;
 #endif
-       char msgbuf[MSGBUFSIZ];
-       char fmtbuf[4 * sizeof(msgbuf) + 1];
+       size_t len, len2;
+       int len3;
+       char msgbuf[MSGBUFSIZ], *msgbufp;
+       char visbuf[MSGBUFSIZ * 4 + 1];
        const char *txt = NULL;
        int pri = LOG_INFO;
        int saved_errno = errno;
@@ -345,24 +348,33 @@
                pri = LOG_ERR;
                break;
        }
+       len = sizeof(msgbuf);
+       msgbufp = msgbuf;
        if (txt != NULL) {
-               snprintf(fmtbuf, sizeof(fmtbuf), "%s: %s", txt, fmt);
-               vsnprintf(msgbuf, sizeof(msgbuf), fmtbuf, args);
-       } else {
-               vsnprintf(msgbuf, sizeof(msgbuf), fmt, args);
+               len2 = strlen(txt);
+               if (len2 >= len)
+                       len2 = len - 1;
+               memcpy(msgbufp, txt, len2);
+               msgbufp += len2;
+               *msgbufp++ = '\0';
+               len -= len2 + 1;
        }
-       strvis(fmtbuf, msgbuf, VIS_SAFE|VIS_OCTAL);
+       vsnprintf(msgbufp, len, fmt, args);
+       len3 = strvis(visbuf, msgbuf, VIS_SAFE|VIS_OCTAL);
        if (log_on_stderr) {
-               snprintf(msgbuf, sizeof msgbuf, "%s\r\n", fmtbuf);
-               write(STDERR_FILENO, msgbuf, strlen(msgbuf));
+               struct iovec iov[] = {
+                       { visbuf, len3 },
+                       { __UNCONST("\r\n"), 2 },
+               };
+               writev(STDERR_FILENO, iov, __arraycount(iov));
        } else {
 #ifdef SYSLOG_DATA_INIT
                openlog_r(argv0 ? argv0 : __progname, LOG_PID, log_facility, &sdata);
-               syslog_r(pri, &sdata, "%.500s", fmtbuf);
+               syslog_r(pri, &sdata, "%.500s", visbuf);
                closelog_r(&sdata);
 #else
                openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility);
-               syslog(pri, "%.500s", fmtbuf);
+               syslog(pri, "%.500s", visbuf);
                closelog();
 #endif
        }