correct no-such-process error

[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 4cec58c..ad0410c 100644 (file)
--- a/usr/src/sys/kern/subr_prf.c
+++ b/usr/src/sys/kern/subr_prf.c
@@ -1,17 +1,25 @@
-/*     subr_prf.c      6.2     84/07/17        */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)subr_prf.c  6.13 (Berkeley) %G%
+ */

 
 

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/seg.h"
-#include "../h/buf.h"
-#include "../h/conf.h"
-#include "../h/reboot.h"
-#include "../h/vm.h"
-#include "../h/msgbuf.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/proc.h"
-#include "../h/tty.h"
+#include "param.h"
+#include "systm.h"
+#include "seg.h"
+#include "buf.h"
+#include "conf.h"
+#include "reboot.h"
+#include "vm.h"
+#include "msgbuf.h"
+#include "dir.h"
+#include "user.h"
+#include "proc.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "syslog.h"

 
 #ifdef vax
 #include "../vax/mtpr.h"
 
 #ifdef vax
 #include "../vax/mtpr.h"


@@ -44,7 +52,7 @@ char  *panicstr;
  * a character <= 32), give the name of the register.  Thus
  *     printf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
  * would produce output:
  * a character <= 32), give the name of the register.  Thus
  *     printf("reg=%b\n", 3, "\10\2BITTWO\1BITONE\n");
  * would produce output:

- *     reg=2<BITTWO,BITONE>
+ *     reg=3<BITTWO,BITONE>

  */
 /*VARARGS1*/
 printf(fmt, x1)
  */
 /*VARARGS1*/
 printf(fmt, x1)


@@ -57,33 +65,60 @@ printf(fmt, x1)
 }
 
 /*
 }
 
 /*

- * Uprintf prints to the current user's terminal,
- * guarantees not to sleep (so can be called by interrupt routines)
- * and does no watermark checking - (so no verbose messages).
+ * Uprintf prints to the current user's terminal.
+ * It may block if the tty queue is overfull.
+ * Should determine whether current terminal user is related
+ * to this process.

  */
 /*VARARGS1*/
 uprintf(fmt, x1)
        char *fmt;
        unsigned x1;
 {
  */
 /*VARARGS1*/
 uprintf(fmt, x1)
        char *fmt;
        unsigned x1;
 {

+#ifdef notdef
+       register struct proc *p;
+#endif
+       register struct tty *tp;

 
 

-       prf(fmt, &x1, TOTTY, u.u_ttyp);
+       if ((tp = u.u_ttyp) == NULL)
+               return;
+#ifdef notdef
+       if (tp->t_pgrp && (p = pfind(tp->t_pgrp)))
+               if (p->p_uid != u.u_uid)        /* doesn't account for setuid */
+                       return;
+#endif
+       (void)ttycheckoutq(tp, 1);
+       prf(fmt, &x1, TOTTY, tp);

 }
 
 }
 

+/*
+ * tprintf prints on the specified terminal (console if none)
+ * and logs the message.  It is designed for error messages from
+ * single-open devices, and may be called from interrupt level
+ * (does not sleep).
+ */

 /*VARARGS2*/
 /*VARARGS2*/

-tprintf(ttyp, fmt, x1)
-       struct tty *ttyp;
+tprintf(tp, fmt, x1)
+       register struct tty *tp;

        char *fmt;
        unsigned x1;
 {
        char *fmt;
        unsigned x1;
 {

+       int flags = TOTTY | TOLOG;
+       extern struct tty cons;

 
 

-       prf(fmt, &x1, TOTTY, ttyp);
+       logpri(LOG_INFO);
+       if (tp == (struct tty *)NULL)
+               tp = &cons;
+       if (ttycheckoutq(tp, 0) == 0)
+               flags = TOLOG;
+       prf(fmt, &x1, flags, tp);
+       logwakeup();

 }
 
 /*
  * Log writes to the log buffer,
 }
 
 /*
  * Log writes to the log buffer,

- * guarantees not to sleep (so can be called by interrupt routines)
- * and does no watermark checking - (so no verbose messages).
+ * 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, x1)
  */
 /*VARARGS2*/
 log(level, fmt, x1)


@@ -91,15 +126,25 @@ log(level, fmt, x1)
        unsigned x1;
 {
        register s = splhigh();
        unsigned x1;
 {
        register s = splhigh();

+       extern int log_open;

 
 

-       putchar('<', TOLOG, (struct tty *)0);
-       printn(level, 10, TOLOG, (struct tty *)0);
-       putchar('>', TOLOG, (struct tty *)0);
+       logpri(level);

        prf(fmt, &x1, TOLOG, (struct tty *)0);
        splx(s);
        prf(fmt, &x1, TOLOG, (struct tty *)0);
        splx(s);

+       if (!log_open)
+               prf(fmt, &x1, TOCONS, (struct tty *)0);

        logwakeup();
 }
 
        logwakeup();
 }
 

+logpri(level)
+       int level;
+{
+
+       putchar('<', TOLOG, (struct tty *)0);
+       printn((u_long)level, 10, TOLOG, (struct tty *)0);
+       putchar('>', TOLOG, (struct tty *)0);
+}
+

 prf(fmt, adx, flags, ttyp)
        register char *fmt;
        register u_int *adx;
 prf(fmt, adx, flags, ttyp)
        register char *fmt;
        register u_int *adx;


@@ -146,11 +191,9 @@ number:
                printn((u_long)b, *s++, flags, ttyp);
                any = 0;
                if (b) {
                printn((u_long)b, *s++, flags, ttyp);
                any = 0;
                if (b) {

-                       putchar('<', flags, ttyp);

                        while (i = *s++) {
                                if (b & (1 << (i-1))) {
                        while (i = *s++) {
                                if (b & (1 << (i-1))) {

-                                       if (any)
-                                               putchar(',', flags, ttyp);
+                                       putchar(any? ',' : '<', flags, ttyp);

                                        any = 1;
                                        for (; (c = *s) > 32; s++)
                                                putchar(c, flags, ttyp);
                                        any = 1;
                                        for (; (c = *s) > 32; s++)
                                                putchar(c, flags, ttyp);


@@ -229,7 +272,7 @@ tablefull(tab)
        char *tab;
 {
 
        char *tab;
 {
 

-       printf("%s: table is full\n", tab);
+       log(LOG_ERR, "%s: table is full\n", tab);

 }
 
 /*
 }
 
 /*


@@ -242,7 +285,7 @@ harderr(bp, cp)
 {
 
        printf("%s%d%c: hard error sn%d ", cp,
 {
 
        printf("%s%d%c: hard error sn%d ", cp,

-           dkunit(bp), 'a'+(minor(bp->b_dev)&07), bp->b_blkno);
+           minor(bp->b_dev) >> 3, 'a'+(minor(bp->b_dev)&07), bp->b_blkno);

 }
 
 /*
 }
 
 /*


@@ -251,22 +294,22 @@ harderr(bp, cp)
  * are saved in msgbuf for inspection later.
  */
 /*ARGSUSED*/
  * are saved in msgbuf for inspection later.
  */
 /*ARGSUSED*/

-putchar(c, flags, ttyp)
+putchar(c, flags, tp)

        register int c;
        register int c;

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

 {
 
        if (flags & TOTTY) {
 {
 
        if (flags & TOTTY) {

-               register struct tty *tp = ttyp;
+               register s = spltty();

 
 

-               if (tp && (tp->t_state & TS_CARR_ON)) {
-                       register s = spl6();
+               if (tp && (tp->t_state & (TS_CARR_ON | TS_ISOPEN)) ==
+                   (TS_CARR_ON | TS_ISOPEN)) {

                        if (c == '\n')
                                (void) ttyoutput('\r', tp);
                        (void) ttyoutput(c, tp);
                        ttstart(tp);
                        if (c == '\n')
                                (void) ttyoutput('\r', tp);
                        (void) ttyoutput(c, tp);
                        ttstart(tp);

-                       splx(s);

                }
                }

+               splx(s);

        }
        if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177
 #ifdef vax
        }
        if ((flags & TOLOG) && c != '\0' && c != '\r' && c != 0177
 #ifdef vax


@@ -281,9 +324,9 @@ putchar(c, flags, ttyp)
                        for (i=0; i < MSG_BSIZE; i++)
                                msgbuf.msg_bufc[i] = 0;
                }
                        for (i=0; i < MSG_BSIZE; i++)
                                msgbuf.msg_bufc[i] = 0;
                }

+               msgbuf.msg_bufc[msgbuf.msg_bufx++] = c;

                if (msgbuf.msg_bufx < 0 || msgbuf.msg_bufx >= MSG_BSIZE)
                        msgbuf.msg_bufx = 0;
                if (msgbuf.msg_bufx < 0 || msgbuf.msg_bufx >= MSG_BSIZE)
                        msgbuf.msg_bufx = 0;

-               msgbuf.msg_bufc[msgbuf.msg_bufx++] = c;

        }
        if ((flags & TOCONS) && c != '\0')
                cnputc(c);
        }
        if ((flags & TOCONS) && c != '\0')
                cnputc(c);