statfs.f_bsize => statfs.f_iosize; statfs.f_fsize => statfs.f_bsize (for SunOS)

[unix-history] / usr / src / sys / kern / subr_prf.c

diff --git a/usr/src/sys/kern/subr_prf.c b/usr/src/sys/kern/subr_prf.c
index 484daba..6466389 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,53 +1,58 @@
-/*
- * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1986, 1988, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%

  *
  *

- *     @(#)subr_prf.c  7.20 (Berkeley) %G%
+ *     @(#)subr_prf.c  7.33 (Berkeley) %G%

  */
 
  */
 

-#include "param.h"
-#include "systm.h"
-#include "buf.h"
-#include "conf.h"
-#include "reboot.h"
-#include "msgbuf.h"
-#include "user.h"
-#include "proc.h"
-#include "ioctl.h"
-#include "vnode.h"
-#include "file.h"
-#include "tty.h"
-#include "tprintf.h"
-#include "syslog.h"
-#include "malloc.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/buf.h>
+#include <sys/conf.h>
+#include <sys/reboot.h>
+#include <sys/msgbuf.h>
+#include <sys/proc.h>
+#include <sys/ioctl.h>
+#include <sys/vnode.h>
+#include <sys/file.h>
+#include <sys/tty.h>
+#include <sys/tprintf.h>
+#include <sys/syslog.h>
+#include <sys/malloc.h>
+
+/*
+ * Note that stdarg.h and the ANSI style va_start macro is used for both
+ * ANSI and traditional C compilers.
+ */
+#include <machine/stdarg.h>

 
 #ifdef KADB
 #include "machine/kdbparam.h"
 #endif
 
 
 #ifdef KADB
 #include "machine/kdbparam.h"
 #endif
 

-#define TOCONS 0x1
-#define TOTTY  0x2
-#define TOLOG  0x4
+#define TOCONS 0x01
+#define TOTTY  0x02
+#define TOLOG  0x04

 
 

-/*
- * In case console is off,
- * panicstr contains argument to last
- * call to panic.
- */
-char   *panicstr;
-
-extern cnputc();                       /* standard console putc */
-int    (*v_putc)() = cnputc;           /* routine to putc on virtual console */
-extern struct tty cons;                /* standard console tty */

 struct tty *constty;                   /* pointer to console "window" tty */
 
 #ifdef KADB
 extern cngetc();                       /* standard console getc */
 struct tty *constty;                   /* pointer to console "window" tty */
 
 #ifdef KADB
 extern cngetc();                       /* standard console getc */

-extern cnpoll();

 int    (*v_getc)() = cngetc;           /* "" getc from virtual console */
 int    (*v_getc)() = cngetc;           /* "" getc from virtual console */

+extern cnpoll();

 int    (*v_poll)() = cnpoll;           /* kdb hook to enable input polling */
 #endif
 int    (*v_poll)() = cnpoll;           /* kdb hook to enable input polling */
 #endif

+extern cnputc();                       /* standard console putc */
+int    (*v_putc)() = cnputc;           /* routine to putc on virtual console */
+
+void  logpri __P((int level));
+static void  putchar __P((int ch, int flags, struct tty *tp));
+static char *ksprintn __P((u_long num, int base, int *len));
+void kprintf __P((const char *fmt, int flags, struct tty *tp, va_list ap, ...));
+
+int consintr = 1;                      /* Ok to handle console interrupts? */

 
 extern cnputc();                       /* standard console putc */
 extern struct tty cons;                /* standard console tty */
 
 extern cnputc();                       /* standard console putc */
 extern struct tty cons;                /* standard console tty */


@@ -55,346 +60,435 @@ struct    tty *constty;                   /* pointer to console "window" tty */
 int    (*v_console)() = cnputc;        /* routine to putc on virtual console */
 
 /*
 int    (*v_console)() = cnputc;        /* routine to putc on virtual console */
 
 /*

- * Scaled down version of C Library printf.
- * Used to print diagnostic information directly on console tty.
- * Since it is not interrupt driven, all system activities are
- * suspended.  Printf should not be used for chit-chat.
- *
- * One additional format: %b is supported to decode error registers.
- * Usage is:
- *     printf("reg=%b\n", regval, "<base><arg>*");
- * Where <base> is the output base expressed as a control character,
- * e.g. \10 gives octal; \20 gives hex.  Each arg is a sequence of
- * characters, the first of which gives the bit number to be inspected
- * (origin 1), and the next characters (up to a control character, i.e.
- * a character <= 32), give the name of the register.  Thus
- *     printf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
- * would produce output:
- *     reg=3<BITTWO,BITONE>
- *
- * Another additional format: %r is used to pass an additional format string
- * and argument list recursively.  Usage is typically:
- *
- * fn(otherstuff, fmt [, arg1, ... ] )
- *     char *fmt;
- *     u_int arg1, ...;
- *
- *     printf("prefix: %r, other stuff\n", fmt, &arg1);
+ * Variable panicstr contains argument to first call to panic; used as flag
+ * to indicate that the kernel has already called panic.

  */
  */

-#if defined(tahoe)
-int    consintr;
-#endif
+const char *panicstr;

 
 

-/*VARARGS1*/
-printf(fmt, args)
+/*
+ * Panic is called on unresolvable fatal errors.  It prints "panic: mesg",
+ * and then reboots.  If we are called twice, then we avoid trying to sync
+ * the disks as this often leads to recursive panics.
+ */
+void
+#ifdef __STDC__
+panic(const char *fmt, ...)
+#else
+panic(fmt /*, va_alist */)

        char *fmt;
        char *fmt;

-       unsigned args;
+#endif

 {
 {

-#if defined(tahoe)
-       register int savintr;
+       int bootopt, savintr;
+       va_list ap;
+
+       bootopt = RB_AUTOBOOT | RB_DUMP;
+       if (panicstr)
+               bootopt |= RB_NOSYNC;
+       else
+               panicstr = fmt;
+
+       savintr = consintr;             /* disable interrupts */
+       consintr = 0;
+
+       va_start(ap, fmt);
+       kprintf("panic: ", TOCONS | TOLOG, NULL, ap);
+       kprintf(fmt, TOCONS | TOLOG, NULL, ap);
+       va_end(ap);
+
+       consintr = savintr;             /* reenable interrupts */

 
 

-       savintr = consintr, consintr = 0;       /* disable interrupts */
+#ifdef KGDB
+       kgdb_panic();

 #endif
 #endif

-       prf(fmt, &args, TOCONS | TOLOG, (struct tty *)NULL);
-       if (!panicstr)
-               logwakeup();
-#if defined(tahoe)
-       consintr = savintr;                     /* reenable interrupts */
+#ifdef KADB
+       if (boothowto & RB_KDB) {
+               int s;
+
+               s = splnet();   /* below kdb pri */
+               setsoftkdb();
+               splx(s);
+       }

 #endif
 #endif

+       boot(bootopt);
+}
+
+/*
+ * Warn that a system table is full.
+ */
+void
+tablefull(tab)
+       char *tab;
+{
+
+       log(LOG_ERR, "%s: table is full\n", tab);

 }
 
 /*
  * Uprintf prints to the controlling terminal for the current process.
 }
 
 /*
  * Uprintf prints to the controlling terminal for the current process.

- * It may block if the tty queue is overfull.
- * No message is printed if the queue does not clear
- * in a reasonable time.
+ * It may block if the tty queue is overfull.  No message is printed if
+ * the queue does not clear in a reasonable time.

  */
  */

-/*VARARGS1*/
-uprintf(fmt, args)
+void
+#ifdef __STDC__
+uprintf(const char *fmt, ...)
+#else
+uprintf(fmt, va_alist)

        char *fmt;
        char *fmt;

-       unsigned args;
+#endif

 {
        register struct proc *p = curproc;
 {
        register struct proc *p = curproc;

+       va_list ap;

 
 

-       if (p->p_flag & SCTTY && p->p_session->s_ttyvp)
-               prf(fmt, &args, TOTTY, p->p_session->s_ttyp);
+       if (p->p_flag & SCTTY && p->p_session->s_ttyvp) {
+               va_start(ap, fmt);
+               kprintf(fmt, TOTTY, p->p_session->s_ttyp, ap);
+               va_end(ap);
+       }

 }
 
 tpr_t
 }
 
 tpr_t

-tprintf_open()
+tprintf_open(p)
+       register struct proc *p;

 {
 {

-       register struct proc *p = curproc;

 
        if (p->p_flag & SCTTY && p->p_session->s_ttyvp) {
                SESSHOLD(p->p_session);
 
        if (p->p_flag & SCTTY && p->p_session->s_ttyvp) {
                SESSHOLD(p->p_session);

-               return ((tpr_t)p->p_session);
-       } else
-               return ((tpr_t)NULL);
+               return ((tpr_t) p->p_session);
+       }
+       return ((tpr_t) NULL);

 }
 
 }
 

+void

 tprintf_close(sess)
        tpr_t sess;
 {
 tprintf_close(sess)
        tpr_t sess;
 {

+

        if (sess)
        if (sess)

-               SESSRELE(sess);
+               SESSRELE((struct session *) sess);

 }
 
 /*
  * tprintf prints on the controlling terminal associated
 }
 
 /*
  * tprintf prints on the controlling terminal associated

- * with the given session.  
+ * with the given session.

  */
  */

-/*VARARGS2*/
-tprintf(sess, fmt, args)
-       register tpr_t sess;
+void
+#ifdef __STDC__
+tprintf(tpr_t tpr, const char *fmt, ...)
+#else
+tprintf(tpr, fmt, va_alist)
+       tpr_t tpr;

        char *fmt;
        char *fmt;

-       unsigned args;
+#endif

 {
 {

+       register struct session *sess = (struct session *)tpr;
+       struct tty *tp = NULL;

        int flags = TOLOG;
        int flags = TOLOG;

+       va_list ap;

 
        logpri(LOG_INFO);
 
        logpri(LOG_INFO);

-
-       if (sess && sess->s_ttyvp && ttycheckoutq(sess->s_ttyp, 0))
+       if (sess && sess->s_ttyvp && ttycheckoutq(sess->s_ttyp, 0)) {

                flags |= TOTTY;
                flags |= TOTTY;

-       prf(fmt, &args, flags, sess->s_ttyp);
+               tp = sess->s_ttyp;
+       }
+       va_start(ap, fmt);
+       kprintf(fmt, flags, tp, ap);
+       va_end(ap);

        logwakeup();
 }
 
        logwakeup();
 }
 

+/*
+ * Ttyprintf displays a message on a tty; it should be used only by
+ * the tty driver, or anything that knows the underlying tty will not
+ * be revoke(2)'d away.  Other callers should use tprintf.
+ */
+void
+#ifdef __STDC__
+ttyprintf(struct tty *tp, const char *fmt, ...)
+#else
+ttyprintf(tp, fmt, va_alist)
+       struct tty *tp;
+       char *fmt;
+#endif
+{
+       va_list ap;
+
+       va_start(ap, fmt);
+       kprintf(fmt, TOTTY, tp, ap);
+       va_end(ap);
+}
+
+extern int log_open;

 
 /*
 
 /*

- * Log writes to the log buffer,
- * and guarantees not to sleep (so can be called by interrupt routines).
- * If there is no process reading the log yet, it writes to the console also.
+ * Log writes to the log buffer, and guarantees not to sleep (so can be
+ * called by interrupt routines).  If there is no process reading the
+ * log yet, it writes to the console also.

  */
  */

-/*VARARGS2*/
-log(level, fmt, args)
+void
+#ifdef __STDC__
+log(int level, const char *fmt, ...)
+#else
+log(level, fmt, va_alist)
+       int level;

        char *fmt;
        char *fmt;

-       unsigned args;
+#endif

 {
 {

-       register s = splhigh();
-       extern int log_open;
+       register int s;
+       va_list ap;

 
 

+       s = splhigh();

        logpri(level);
        logpri(level);

-       prf(fmt, &args, TOLOG, (struct tty *)NULL);
+       va_start(ap, fmt);
+       kprintf(fmt, TOLOG, NULL, ap);

        splx(s);
        splx(s);

-       if (!log_open)
-               prf(fmt, &args, TOCONS, (struct tty *)NULL);
+       va_end(ap);
+       if (!log_open) {
+               va_start(ap, fmt);
+               kprintf(fmt, TOCONS, NULL, ap);
+               va_end(ap);
+       }

        logwakeup();
 }
 
        logwakeup();
 }
 

+void

 logpri(level)
        int level;
 {
 logpri(level)
        int level;
 {

+       register int ch;
+       register char *p;

 
 

-       putchar('<', TOLOG, (struct tty *)NULL);
-       printn((u_long)level, 10, TOLOG, (struct tty *)NULL);
-       putchar('>', TOLOG, (struct tty *)NULL);
+       putchar('<', TOLOG, NULL);
+       for (p = ksprintn((u_long)level, 10, NULL); ch = *p--;)
+               putchar(ch, TOLOG, NULL);
+       putchar('>', TOLOG, NULL);

 }
 
 }
 

-/*VARARGS1*/
-addlog(fmt, args)
+void
+#ifdef __STDC__
+addlog(const char *fmt, ...)
+#else
+addlog(fmt, va_alist)

        char *fmt;
        char *fmt;

-       unsigned args;
+#endif

 {
 {

-       register s = splhigh();
+       register int s;
+       va_list ap;

 
 

-       prf(fmt, &args, TOLOG, (struct tty *)NULL);
+       s = splhigh();
+       va_start(ap, fmt);
+       kprintf(fmt, TOLOG, NULL, ap);

        splx(s);
        splx(s);

-       if (!log_open)
-               prf(fmt, &args, TOCONS, (struct tty *)NULL);
+       va_end(ap);
+       if (!log_open) {
+               va_start(ap, fmt);
+               kprintf(fmt, TOCONS, NULL, ap);
+               va_end(ap);
+       }

        logwakeup();
 }
 
        logwakeup();
 }
 

-prf(fmt, argp, flags, ttyp)
-       register char *fmt;
-       register u_int *argp;
-       struct tty *ttyp;
-{
-       register int b, c, i;
-       char *s;
-       int any;
-
-loop:
-       while ((c = *fmt++) != '%') {
-               if (c == '\0')
-                       return;
-               putchar(c, flags, ttyp);
-       }
-again:
-       c = *fmt++;
-       /* THIS CODE IS MACHINE DEPENDENT IN HANDLING %l? AND %c */
-       switch (c) {
-
-       case 'l':
-               goto again;
-       case 'x': case 'X':
-               b = 16;
-               goto number;
-       case 'd': case 'D':
-               b = -10;
-               goto number;
-       case 'u':
-               b = 10;
-               goto number;
-       case 'o': case 'O':
-               b = 8;
-number:
-               printn((u_long)*argp, b, flags, ttyp);
-               break;
-       case 'c':
-               b = *argp;
-#if BYTE_ORDER == LITTLE_ENDIAN
-               for (i = 24; i >= 0; i -= 8)
-                       if (c = (b >> i) & 0x7f)
-                               putchar(c, flags, ttyp);
-#endif
-#if BYTE_ORDER == BIG_ENDIAN
-               if (c = (b & 0x7f))
-                       putchar(c, flags, ttyp);
+void
+#ifdef __STDC__
+printf(const char *fmt, ...)
+#else
+printf(fmt, va_alist)
+       char *fmt;

 #endif
 #endif

-               break;
-       case 'b':
-               b = *argp++;
-               s = (char *)*argp;
-               printn((u_long)b, *s++, flags, ttyp);
-               any = 0;
-               if (b) {
-                       while (i = *s++) {
-                               if (b & (1 << (i-1))) {
-                                       putchar(any ? ',' : '<', flags, ttyp);
-                                       any = 1;
-                                       for (; (c = *s) > 32; s++)
-                                               putchar(c, flags, ttyp);
-                               } else
-                                       for (; *s > 32; s++)
-                                               ;
-                       }
-                       if (any)
-                               putchar('>', flags, ttyp);
-               }
-               break;
-
-       case 's':
-               s = (char *)*argp;
-               while (c = *s++)
-                       putchar(c, flags, ttyp);
-               break;
-
-       case 'r':
-               s = (char *)*argp++;
-               prf(s, (u_int *)*argp, flags, ttyp);
-               break;
-
-       case '%':
-               putchar('%', flags, ttyp);
-               break;
-       }
-       argp++;
-       goto loop;
-}
-
-/*
- * Printn prints a number n in base b.
- * We avoid recursion to avoid deep kernel stacks.
- */
-printn(n, b, flags, ttyp)
-       u_long n;
-       struct tty *ttyp;

 {
 {

-       char prbuf[11];
-       register char *cp;
+       va_list ap;
+       register int savintr;

 
 

-       if (b == -10) {
-               if ((int)n < 0) {
-                       putchar('-', flags, ttyp);
-                       n = (unsigned)(-(int)n);
-               }
-               b = -b;
-       }
-       cp = prbuf;
-       do {
-               *cp++ = "0123456789abcdef"[n%b];
-               n /= b;
-       } while (n);
-       do
-               putchar(*--cp, flags, ttyp);
-       while (cp > prbuf);
+       savintr = consintr;             /* disable interrupts */
+       consintr = 0;
+       va_start(ap, fmt);
+       kprintf(fmt, TOCONS | TOLOG, NULL, ap);
+       va_end(ap);
+       if (!panicstr)
+               logwakeup();
+       consintr = savintr;             /* reenable interrupts */

 }
 
 /*
 }
 
 /*

- * Panic is called on unresolvable fatal errors.
- * It prints "panic: mesg", and then reboots.
- * If we are called twice, then we avoid trying to
- * sync the disks as this often leads to recursive panics.
+ * Scaled down version of printf(3).
+ *
+ * Two additional formats:
+ *
+ * The format %b is supported to decode error registers.
+ * Its usage is:
+ *
+ *     kprintf("reg=%b\n", regval, "<base><arg>*");
+ *
+ * where <base> is the output base expressed as a control character, e.g.
+ * \10 gives octal; \20 gives hex.  Each arg is a sequence of characters,
+ * the first of which gives the bit number to be inspected (origin 1), and
+ * the next characters (up to a control character, i.e. a character <= 32),
+ * give the name of the register.  Thus:
+ *
+ *     kprintf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
+ *
+ * would produce output:
+ *
+ *     reg=3<BITTWO,BITONE>
+ *
+ * The format %r passes an additional format string and argument list
+ * recursively.  Its usage is:
+ *
+ * fn(char *fmt, ...)
+ * {
+ *     va_list ap;
+ *     va_start(ap, fmt);
+ *     kprintf("prefix: %r: suffix\n", flags, tp, fmt, ap);
+ *     va_end(ap);
+ * }
+ *
+ * Space or zero padding and a field width are supported for the numeric
+ * formats only.

  */
  */

-panic(s)
-       char *s;
-{
-       int bootopt = RB_AUTOBOOT | RB_DUMP;
-
-       if (panicstr)
-               bootopt |= RB_NOSYNC;
-       else
-               panicstr = s;
-       printf("panic: %s\n", s);
-#ifdef KGDB
-       kgdb_panic();
+void
+#ifdef __STDC__
+kprintf(const char *fmt, int flags, struct tty *tp, va_list ap, ...)
+#else
+kprintf(fmt, flags, tp)
+       register const char *fmt;
+       int flags;
+       struct tty *tp;
+       va_list ap;

 #endif
 #endif

-#ifdef KADB
-       if (boothowto & RB_KDB) {
-               int x = splnet();       /* below kdb pri */
-
-               setsoftkdb();
-               splx(x);
-       }
-#endif
-       boot(bootopt);
-}
-
-/*
- * Warn that a system table is full.
- */
-tablefull(tab)
-       char *tab;

 {
 {

-
-       log(LOG_ERR, "%s: table is full\n", tab);
+       register char *p;
+       register int ch, n;
+       u_long ul;
+       int base, lflag, tmp, width;
+       char padc;
+
+       for (;;) {
+               padc = ' ';
+               width = 0;
+               while ((ch = *(u_char *)fmt++) != '%') {
+                       if (ch == '\0')
+                               return;
+                       putchar(ch, flags, tp);
+               }
+               lflag = 0;
+reswitch:      switch (ch = *(u_char *)fmt++) {
+               case '0':
+                       padc = '0';
+                       goto reswitch;
+               case '1': case '2': case '3': case '4':
+               case '5': case '6': case '7': case '8': case '9':
+                       for (width = 0;; ++fmt) {
+                               width = width * 10 + ch - '0';
+                               ch = *fmt;
+                               if (ch < '0' || ch > '9')
+                                       break;
+                       }
+                       goto reswitch;
+               case 'l':
+                       lflag = 1;
+                       goto reswitch;
+               case 'b':
+                       ul = va_arg(ap, int);
+                       p = va_arg(ap, char *);
+                       for (p = ksprintn(ul, *p++, NULL); ch = *p--;)
+                               putchar(ch, flags, tp);
+
+                       if (!ul)
+                               break;
+
+                       for (tmp = 0; n = *p++;) {
+                               if (ul & (1 << (n - 1))) {
+                                       putchar(tmp ? ',' : '<', flags, tp);
+                                       for (; (n = *p) > ' '; ++p)
+                                               putchar(n, flags, tp);
+                                       tmp = 1;
+                               } else
+                                       for (; *p > ' '; ++p);
+                       }
+                       if (tmp)
+                               putchar('>', flags, tp);
+                       break;
+               case 'c':
+                       putchar(va_arg(ap, int), flags, tp);
+                       break;
+               case 'r':
+                       p = va_arg(ap, char *);
+                       kprintf(p, flags, tp, va_arg(ap, va_list));
+                       break;
+               case 's':
+                       p = va_arg(ap, char *);
+                       while (ch = *p++)
+                               putchar(ch, flags, tp);
+                       break;
+               case 'd':
+                       ul = lflag ? va_arg(ap, long) : va_arg(ap, int);
+                       if ((long)ul < 0) {
+                               putchar('-', flags, tp);
+                               ul = -(long)ul;
+                       }
+                       base = 10;
+                       goto number;
+               case 'o':
+                       ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int);
+                       base = 8;
+                       goto number;
+               case 'u':
+                       ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int);
+                       base = 10;
+                       goto number;
+               case 'x':
+                       ul = lflag ? va_arg(ap, u_long) : va_arg(ap, u_int);
+                       base = 16;
+number:                        p = ksprintn(ul, base, &tmp);
+                       if (width && (width -= tmp) > 0)
+                               while (width--)
+                                       putchar(padc, flags, tp);
+                       while (ch = *p--)
+                               putchar(ch, flags, tp);
+                       break;
+               default:
+                       putchar('%', flags, tp);
+                       if (lflag)
+                               putchar('l', flags, tp);
+                       /* FALLTHROUGH */
+               case '%':
+                       putchar(ch, flags, tp);
+               }
+       }

 }
 
 /*
 }
 
 /*

- * Print a character on console or users terminal.
- * If destination is console then the last MSGBUFS characters
- * are saved in msgbuf for inspection later.
+ * Print a character on console or users terminal.  If destination is
+ * the console then the last MSGBUFS characters are saved in msgbuf for
+ * inspection later.

  */
  */

-/*ARGSUSED*/
-putchar(c, flags, ttyp)
+static void
+putchar(c, flags, tp)

        register int c;
        register int c;

-       struct tty *ttyp;
+       int flags;
+       struct tty *tp;

 {
 {

-       register struct msgbuf *mbp = msgbufp;

        extern int msgbufmapped;
        extern int msgbufmapped;

+       register struct msgbuf *mbp;

 
        if (panicstr)
 
        if (panicstr)

-               constty = 0;
-       if ((flags & TOCONS) && ttyp == NULL && constty) {
-               ttyp = constty;
+               constty = NULL;
+       if ((flags & TOCONS) && tp == NULL && constty) {
+               tp = constty;

                flags |= TOTTY;
        }
        if ((flags & TOCONS) && panicstr == 0 && tp == 0 && constty) {
                tp = constty;
                flags |= TOTTY;
        }
                flags |= TOTTY;
        }
        if ((flags & TOCONS) && panicstr == 0 && tp == 0 && constty) {
                tp = constty;
                flags |= TOTTY;
        }

-       if ((flags & TOTTY) && ttyp && tputchar(c, ttyp) < 0 &&
-           (flags & TOCONS) && ttyp == constty)
-               constty = 0;
-       if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177 &&
-           msgbufmapped) {
+       if ((flags & TOTTY) && tp && tputchar(c, tp) < 0 &&
+           (flags & TOCONS) && tp == constty)
+               constty = NULL;
+       if ((flags & TOLOG) &&
+           c != '\0' && c != '\r' && c != 0177 && msgbufmapped) {
+               mbp = msgbufp;

                if (mbp->msg_magic != MSG_MAGIC) {
                if (mbp->msg_magic != MSG_MAGIC) {

-                       register int i;
-
+                       bzero((caddr_t)mbp, sizeof(*mbp));

                        mbp->msg_magic = MSG_MAGIC;
                        mbp->msg_magic = MSG_MAGIC;

-                       mbp->msg_bufx = mbp->msg_bufr = 0;
-                       for (i=0; i < MSG_BSIZE; i++)
-                               mbp->msg_bufc[i] = 0;

                }
                mbp->msg_bufc[mbp->msg_bufx++] = c;
                if (mbp->msg_bufx < 0 || mbp->msg_bufx >= MSG_BSIZE)
                }
                mbp->msg_bufc[mbp->msg_bufx++] = c;
                if (mbp->msg_bufx < 0 || mbp->msg_bufx >= MSG_BSIZE)