curproc is null if no one is running, but ignore curproc unless wait is true
[unix-history] / usr / src / sys / kern / tty.c
index 08baeb4..02dd8ea 100644 (file)
-/*
- * Copyright (c) 1982 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
+ * Copyright (c) 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
  *
  *
- *     @(#)tty.c       6.22 (Berkeley) %G%
+ *     @(#)tty.c       7.45 (Berkeley) %G%
  */
 
  */
 
-#include "../machine/reg.h"
-
 #include "param.h"
 #include "systm.h"
 #include "param.h"
 #include "systm.h"
-#include "dir.h"
-#include "user.h"
 #include "ioctl.h"
 #include "ioctl.h"
+#define TTYDEFCHARS
 #include "tty.h"
 #include "tty.h"
+#undef TTYDEFCHARS
+#define TTYDEFCHARS
+#include "ttydefaults.h"
+#undef TTYDEFCHARS
+#include "termios.h"
 #include "proc.h"
 #include "proc.h"
-#include "inode.h"
 #include "file.h"
 #include "conf.h"
 #include "file.h"
 #include "conf.h"
-#include "buf.h"
-#include "dk.h"
+#include "dkstat.h"
 #include "uio.h"
 #include "kernel.h"
 #include "uio.h"
 #include "kernel.h"
+#include "vnode.h"
+#include "syslog.h"
+
+#include "vm/vm.h"
+#include "syslog.h"
+
+static int proc_compare __P((struct proc *p1, struct proc *p2));
+
+/* symbolic sleep message strings */
+char ttyin[] = "ttyin";
+char ttyout[] = "ttyout";
+char ttopen[] = "ttyopn";
+char ttclos[] = "ttycls";
+char ttybg[] = "ttybg";
+char ttybuf[] = "ttybuf";
 
 /*
  * Table giving parity for characters and indicating
 
 /*
  * Table giving parity for characters and indicating
- * character classes to tty driver.  In particular,
- * if the low 6 bits are 0, then the character needs
- * no special processing on output.
+ * character classes to tty driver. The 8th bit
+ * indicates parity, the 7th bit indicates the character
+ * is an alphameric or underscore (for ALTWERASE), and the 
+ * low 6 bits indicate delay type.  If the low 6 bits are 0
+ * then the character needs no special processing on output;
+ * classes other than 0 might be translated or (not currently)
+ * require delays.
  */
  */
+#define        PARITY(c)       (partab[c] & 0x80)
+#define        ISALPHA(c)      (partab[(c)&TTY_CHARMASK] & 0x40)
+#define        CCLASSMASK      0x3f
+#define        CCLASS(c)       (partab[c] & CCLASSMASK)
+
+#define        E       0x00    /* even parity */
+#define        O       0x80    /* odd parity */
+#define        ALPHA   0x40    /* alpha or underscore */
+
+#define        NO      ORDINARY
+#define        NA      ORDINARY|ALPHA
+#define        CC      CONTROL
+#define        BS      BACKSPACE
+#define        NL      NEWLINE
+#define        TB      TAB
+#define        VT      VTAB
+#define        CR      RETURN
 
 char partab[] = {
 
 char partab[] = {
-       0001,0201,0201,0001,0201,0001,0001,0201,
-       0202,0004,0003,0201,0005,0206,0201,0001,
-       0201,0001,0001,0201,0001,0201,0201,0001,
-       0001,0201,0201,0001,0201,0001,0001,0201,
-       0200,0000,0000,0200,0000,0200,0200,0000,
-       0000,0200,0200,0000,0200,0000,0000,0200,
-       0000,0200,0200,0000,0200,0000,0000,0200,
-       0200,0000,0000,0200,0000,0200,0200,0000,
-       0200,0000,0000,0200,0000,0200,0200,0000,
-       0000,0200,0200,0000,0200,0000,0000,0200,
-       0000,0200,0200,0000,0200,0000,0000,0200,
-       0200,0000,0000,0200,0000,0200,0200,0000,
-       0000,0200,0200,0000,0200,0000,0000,0200,
-       0200,0000,0000,0200,0000,0200,0200,0000,
-       0200,0000,0000,0200,0000,0200,0200,0000,
-       0000,0200,0200,0000,0200,0000,0000,0201,
-
+       E|CC, O|CC, O|CC, E|CC, O|CC, E|CC, E|CC, O|CC, /* nul - bel */
+       O|BS, E|TB, E|NL, O|CC, E|VT, O|CR, O|CC, E|CC, /* bs - si */
+       O|CC, E|CC, E|CC, O|CC, E|CC, O|CC, O|CC, E|CC, /* dle - etb */
+       E|CC, O|CC, O|CC, E|CC, O|CC, E|CC, E|CC, O|CC, /* can - us */
+       O|NO, E|NO, E|NO, O|NO, E|NO, O|NO, O|NO, E|NO, /* sp - ' */
+       E|NO, O|NO, O|NO, E|NO, O|NO, E|NO, E|NO, O|NO, /* ( - / */
+       E|NA, O|NA, O|NA, E|NA, O|NA, E|NA, E|NA, O|NA, /* 0 - 7 */
+       O|NA, E|NA, E|NO, O|NO, E|NO, O|NO, O|NO, E|NO, /* 8 - ? */
+       O|NO, E|NA, E|NA, O|NA, E|NA, O|NA, O|NA, E|NA, /* @ - G */
+       E|NA, O|NA, O|NA, E|NA, O|NA, E|NA, E|NA, O|NA, /* H - O */
+       E|NA, O|NA, O|NA, E|NA, O|NA, E|NA, E|NA, O|NA, /* P - W */
+       O|NA, E|NA, E|NA, O|NO, E|NO, O|NO, O|NO, O|NA, /* X - _ */
+       E|NO, O|NA, O|NA, E|NA, O|NA, E|NA, E|NA, O|NA, /* ` - g */
+       O|NA, E|NA, E|NA, O|NA, E|NA, O|NA, O|NA, E|NA, /* h - o */
+       O|NA, E|NA, E|NA, O|NA, E|NA, O|NA, O|NA, E|NA, /* p - w */
+       E|NA, O|NA, O|NA, E|NO, O|NO, E|NO, E|NO, O|CC, /* x - del */
        /*
        /*
-        * 7 bit ascii ends with the last character above,
-        * but we contine through all 256 codes for the sake
-        * of the tty output routines which use special vax
-        * instructions which need a 256 character trt table.
+        * "meta" chars; should be settable per charset.
+        * For now, treat all as normal characters.
         */
         */
-
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007,
-       0007,0007,0007,0007,0007,0007,0007,0007
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
+       NA,   NA,   NA,   NA,   NA,   NA,   NA,   NA,
 };
 };
+#undef NO
+#undef NA
+#undef CC
+#undef BS
+#undef NL
+#undef TB
+#undef VT
+#undef CR
+
+extern struct tty *constty;            /* temporary virtual console */
 
 /*
 
 /*
- * Input mapping table-- if an entry is non-zero, when the
- * corresponding character is typed preceded by "\" the escape
- * sequence is replaced by the table value.  Mostly used for
- * upper-case only terminals.
+ * Is 'c' a line delimiter ("break" character)?
  */
  */
-char   maptab[] ={
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,'|',000,000,000,000,000,'`',
-       '{','}',000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,000,000,
-       000,000,000,000,000,000,'~',000,
-       000,'A','B','C','D','E','F','G',
-       'H','I','J','K','L','M','N','O',
-       'P','Q','R','S','T','U','V','W',
-       'X','Y','Z',000,000,000,000,000,
-};
+#define ttbreakc(c) ((c) == '\n' || ((c) == cc[VEOF] || \
+       (c) == cc[VEOL] || (c) == cc[VEOL2]) && (c) != _POSIX_VDISABLE)
 
 
-short  tthiwat[16] =
-   { 100,100,100,100,100,100,100,200,200,400,400,400,650,650,1300,2000 };
-short  ttlowat[16] =
-   {  30, 30, 30, 30, 30, 30, 30, 50, 50,120,120,120,125,125,125,125 };
+/*
+ * Debugging aids
+ */
+#define dprintf        if (tp->t_trace & TTRACE_IO)printf
 
 
-struct ttychars ttydefaults = {
-       CERASE, CKILL,  CINTR,  CQUIT,  CSTART, CSTOP,  CEOF,
-       CBRK,   CSUSP,  CDSUSP, CRPRNT, CFLUSH, CWERASE,CLNEXT
-};
+/*
+ * Is 'c' a line delimiter ("break" character)?
+ */
+#define ttbreakc(c) (c == '\n' || CCEQ(cc[VEOF], c) || \
+               CCEQ(cc[VEOL], c) || CCEQ(cc[VEOL2], c))
 
 ttychars(tp)
        struct tty *tp;
 {
 
 
 ttychars(tp)
        struct tty *tp;
 {
 
-       tp->t_chars = ttydefaults;
+       bcopy(ttydefchars, tp->t_cc, sizeof(ttydefchars));
 }
 
 /*
 }
 
 /*
- * Wait for output to drain, then flush input waiting.
+ *
+ * Flush tty after output has drained.
  */
 ttywflush(tp)
  */
 ttywflush(tp)
-       register struct tty *tp;
+       struct tty *tp;
 {
 {
+       int error;
 
 
-       ttywait(tp);
-       ttyflush(tp, FREAD);
+       if ((error = ttywait(tp)) == 0)
+               ttyflush(tp, FREAD);
+       return (error);
 }
 
 }
 
+/*
+ * Wait for output to drain.
+ */
+/*
+ * Wait for output to drain.
+ */
 ttywait(tp)
        register struct tty *tp;
 {
 ttywait(tp)
        register struct tty *tp;
 {
-       register int s = spltty();
+       int error = 0, s = spltty();
 
        while ((tp->t_outq.c_cc || tp->t_state&TS_BUSY) &&
 
        while ((tp->t_outq.c_cc || tp->t_state&TS_BUSY) &&
-           tp->t_state&TS_CARR_ON) {
+           (tp->t_state&TS_CARR_ON || tp->t_cflag&CLOCAL) && 
+           tp->t_oproc) {
                (*tp->t_oproc)(tp);
                tp->t_state |= TS_ASLEEP;
                (*tp->t_oproc)(tp);
                tp->t_state |= TS_ASLEEP;
-               sleep((caddr_t)&tp->t_outq, TTOPRI);
+               if (error = ttysleep(tp, (caddr_t)&tp->t_outq, 
+                   TTOPRI | PCATCH, ttyout, 0))
+                       break;
        }
        splx(s);
        }
        splx(s);
+       return (error);
+}
+
+#define        flushq(qq) { \
+       register struct clist *q = qq; \
+       if (q->c_cc) \
+               ndflush(q, q->c_cc); \
 }
 
 /*
 }
 
 /*
- * Flush all TTY queues
+ * Flush TTY read and/or write queues,
+ * notifying anyone waiting.
  */
 ttyflush(tp, rw)
        register struct tty *tp;
  */
 ttyflush(tp, rw)
        register struct tty *tp;
@@ -150,23 +196,23 @@ ttyflush(tp, rw)
 
        s = spltty();
        if (rw & FREAD) {
 
        s = spltty();
        if (rw & FREAD) {
-               while (getc(&tp->t_canq) >= 0)
-                       ;
-               wakeup((caddr_t)&tp->t_rawq);
+               flushq(&tp->t_canq);
+               flushq(&tp->t_rawq);
+               tp->t_rocount = 0;
+               tp->t_rocol = 0;
+               tp->t_state &= ~TS_LOCAL;
+               ttwakeup(tp);
        }
        if (rw & FWRITE) {
        }
        if (rw & FWRITE) {
-               wakeup((caddr_t)&tp->t_outq);
                tp->t_state &= ~TS_TTSTOP;
                (*cdevsw[major(tp->t_dev)].d_stop)(tp, rw);
                tp->t_state &= ~TS_TTSTOP;
                (*cdevsw[major(tp->t_dev)].d_stop)(tp, rw);
-               while (getc(&tp->t_outq) >= 0)
-                       ;
-       }
-       if (rw & FREAD) {
-               while (getc(&tp->t_rawq) >= 0)
-                       ;
-               tp->t_rocount = 0;
-               tp->t_rocol = 0;
-               tp->t_state &= ~TS_LOCAL;
+               flushq(&tp->t_outq);
+               wakeup((caddr_t)&tp->t_outq);
+               if (tp->t_wsel) {
+                       selwakeup(tp->t_wsel, tp->t_state & TS_WCOLL);
+                       tp->t_wsel = 0;
+                       tp->t_state &= ~TS_WCOLL;
+               }
        }
        splx(s);
 }
        }
        splx(s);
 }
@@ -188,61 +234,52 @@ ttyblock(tp)
         * Block further input iff:
         * Current input > threshold AND input is available to user program
         */
         * Block further input iff:
         * Current input > threshold AND input is available to user program
         */
-       if (x >= TTYHOG/2 && 
-           ((tp->t_flags & (RAW|CBREAK)) || (tp->t_canq.c_cc > 0))) {
-               if (putc(tp->t_stopc, &tp->t_outq)==0) {
+       if (x >= TTYHOG/2 && (tp->t_state & TS_TBLOCK) == 0 &&
+           (!(tp->t_lflag&ICANON)) || (tp->t_canq.c_cc > 0) &&
+           tp->t_cc[VSTOP] != POSIX_V_DISABLE) {
+               if (putc(tp->t_cc[VSTOP], &tp->t_outq)==0) {
                        tp->t_state |= TS_TBLOCK;
                        ttstart(tp);
                }
        }
 }
 
                        tp->t_state |= TS_TBLOCK;
                        ttstart(tp);
                }
        }
 }
 
-/*
- * Restart typewriter output following a delay
- * timeout.
- * The name of the routine is passed to the timeout
- * subroutine and it is called during a clock interrupt.
- */
-ttrstrt(tp)
-       register struct tty *tp;
+ttstart(tp)
+       struct tty *tp;
 {
 
 {
 
+       if (tp->t_oproc)                /* kludge for pty */
+               (*tp->t_oproc)(tp);
+}
+
+ttrstrt(tp)                            /* XXX */
+       struct tty *tp;
+{
+
+#ifdef DIAGNOSTIC
        if (tp == 0)
                panic("ttrstrt");
        if (tp == 0)
                panic("ttrstrt");
+#endif
        tp->t_state &= ~TS_TIMEOUT;
        ttstart(tp);
 }
 
        tp->t_state &= ~TS_TIMEOUT;
        ttstart(tp);
 }
 
-/*
- * Start output on the typewriter. It is used from the top half
- * after some characters have been put on the output queue,
- * from the interrupt routine to transmit the next
- * character, and after a timeout has finished.
- */
-ttstart(tp)
-       register struct tty *tp;
-{
-       register s;
-
-       s = spltty();
-       if ((tp->t_state & (TS_TIMEOUT|TS_TTSTOP|TS_BUSY)) == 0 &&
-           tp->t_oproc)                /* kludge for pty */
-               (*tp->t_oproc)(tp);
-       splx(s);
-}
 
 /*
 
 /*
- * Common code for tty ioctls.
+ * Common code for ioctls on tty devices.
+ * Called after line-discipline-specific ioctl
+ * has been called to do discipline-specific functions
+ * and/or reject any of these ioctl commands.
  */
 /*ARGSUSED*/
 ttioctl(tp, com, data, flag)
        register struct tty *tp;
        caddr_t data;
 {
  */
 /*ARGSUSED*/
 ttioctl(tp, com, data, flag)
        register struct tty *tp;
        caddr_t data;
 {
-       int dev = tp->t_dev;
+       register struct proc *p = curproc;              /* XXX */
        extern int nldisp;
        extern int nldisp;
-       int s;
-       register int newflags;
+       int soft;
+       int s, error;
 
        /*
         * If the ioctl involves modification,
 
        /*
         * If the ioctl involves modification,
@@ -250,25 +287,31 @@ ttioctl(tp, com, data, flag)
         */
        switch (com) {
 
         */
        switch (com) {
 
-       case TIOCSETD:
+       case TIOCSETD: 
+       case TIOCFLUSH:
+       case TIOCSTI:
+       case TIOCSWINSZ:
+       case TIOCSETA:
+       case TIOCSETAW:
+       case TIOCSETAF:
+#ifdef COMPAT_43
        case TIOCSETP:
        case TIOCSETN:
        case TIOCSETP:
        case TIOCSETN:
-       case TIOCFLUSH:
        case TIOCSETC:
        case TIOCSLTC:
        case TIOCSETC:
        case TIOCSLTC:
-       case TIOCSPGRP:
        case TIOCLBIS:
        case TIOCLBIC:
        case TIOCLSET:
        case TIOCLBIS:
        case TIOCLBIC:
        case TIOCLSET:
-       case TIOCSTI:
-       case TIOCSWINSZ:
-               while (tp->t_line == NTTYDISC &&
-                  u.u_procp->p_pgrp != tp->t_pgrp && tp == u.u_ttyp &&
-                  (u.u_procp->p_flag&SVFORK) == 0 &&
-                  !(u.u_procp->p_sigignore & sigmask(SIGTTOU)) &&
-                  !(u.u_procp->p_sigmask & sigmask(SIGTTOU))) {
-                       gsignal(u.u_procp->p_pgrp, SIGTTOU);
-                       sleep((caddr_t)&lbolt, TTOPRI);
+       case OTIOCSETD:
+#endif
+               while (isbackground(curproc, tp) && 
+                  p->p_pgrp->pg_jobc && (p->p_flag&SPPWAIT) == 0 &&
+                  (p->p_sigignore & sigmask(SIGTTOU)) == 0 &&
+                  (p->p_sigmask & sigmask(SIGTTOU)) == 0) {
+                       pgsignal(p->p_pgrp, SIGTTOU, 1);
+                       if (error = ttysleep(tp, (caddr_t)&lbolt, 
+                           TTOPRI | PCATCH, ttybg, 0)) 
+                               return (error);
                }
                break;
        }
                }
                break;
        }
@@ -286,20 +329,25 @@ ttioctl(tp, com, data, flag)
        /* set line discipline */
        case TIOCSETD: {
                register int t = *(int *)data;
        /* set line discipline */
        case TIOCSETD: {
                register int t = *(int *)data;
-               int error = 0;
+               dev_t dev = tp->t_dev;
+               dev_t dev = tp->t_dev;
 
 
-               if ((unsigned) t >= nldisp)
+               if ((unsigned)t >= nldisp)
                        return (ENXIO);
                        return (ENXIO);
-               s = spltty();
-               (*linesw[tp->t_line].l_close)(tp);
-               error = (*linesw[t].l_open)(dev, tp);
-               if (error) {
-                       (void) (*linesw[tp->t_line].l_open)(dev, tp);
+               if (t != tp->t_line) {
+                       s = spltty();
+                       (*linesw[tp->t_line].l_close)(tp, flag);
+                       error = (*linesw[t].l_open)(dev, tp);
+                       if (error) {
+                               (void)(*linesw[tp->t_line].l_open)(dev, tp);
+                               splx(s);
+                               return (error);
+                       }
+                       tp->t_line = t;
                        splx(s);
                        splx(s);
-                       return (error);
                }
                }
-               tp->t_line = t;
-               splx(s);
+               if (tp->t_trace & TTRACE_STATE)
+                       ttytrace(com, tp);
                break;
        }
 
                break;
        }
 
@@ -312,9 +360,8 @@ ttioctl(tp, com, data, flag)
                tp->t_state &= ~TS_XCLUDE;
                break;
 
                tp->t_state &= ~TS_XCLUDE;
                break;
 
-       /* hang up line on last close */
        case TIOCHPCL:
        case TIOCHPCL:
-               tp->t_state |= TS_HUPCLS;
+               tp->t_cflag |= HUPCL;
                break;
 
        case TIOCFLUSH: {
                break;
 
        case TIOCFLUSH: {
@@ -328,6 +375,16 @@ ttioctl(tp, com, data, flag)
                break;
        }
 
                break;
        }
 
+       case FIOASYNC:
+               if (*(int *)data)
+                       tp->t_state |= TS_ASYNC;
+               else
+                       tp->t_state &= ~TS_ASYNC;
+               break;
+
+       case FIONBIO:
+               break;  /* XXX remove */
+
        /* return number of characters immediately available */
        case FIONREAD:
                *(off_t *)data = ttnread(tp);
        /* return number of characters immediately available */
        case FIONREAD:
                *(off_t *)data = ttnread(tp);
@@ -348,9 +405,9 @@ ttioctl(tp, com, data, flag)
 
        case TIOCSTART:
                s = spltty();
 
        case TIOCSTART:
                s = spltty();
-               if ((tp->t_state&TS_TTSTOP) || (tp->t_flags&FLUSHO)) {
+               if ((tp->t_state&TS_TTSTOP) || (tp->t_lflag&FLUSHO)) {
                        tp->t_state &= ~TS_TTSTOP;
                        tp->t_state &= ~TS_TTSTOP;
-                       tp->t_flags &= ~FLUSHO;
+                       tp->t_lflag &= ~FLUSHO;
                        ttstart(tp);
                }
                splx(s);
                        ttstart(tp);
                }
                splx(s);
@@ -360,141 +417,91 @@ ttioctl(tp, com, data, flag)
         * Simulate typing of a character at the terminal.
         */
        case TIOCSTI:
         * Simulate typing of a character at the terminal.
         */
        case TIOCSTI:
-               if (u.u_uid && (flag & FREAD) == 0)
+               if (p->p_ucred->cr_uid && (flag & FREAD) == 0)
                        return (EPERM);
                        return (EPERM);
-               if (u.u_uid && u.u_ttyp != tp)
+               if (p->p_ucred->cr_uid && !isctty(p, tp))
                        return (EACCES);
                (*linesw[tp->t_line].l_rint)(*(char *)data, tp);
                break;
 
                        return (EACCES);
                (*linesw[tp->t_line].l_rint)(*(char *)data, tp);
                break;
 
-       case TIOCSETP:
-       case TIOCSETN: {
-               register struct sgttyb *sg = (struct sgttyb *)data;
-
-               tp->t_erase = sg->sg_erase;
-               tp->t_kill = sg->sg_kill;
-               tp->t_ispeed = sg->sg_ispeed;
-               tp->t_ospeed = sg->sg_ospeed;
-               newflags = (tp->t_flags&0xffff0000) | (sg->sg_flags&0xffff);
-               s = spltty();
-               if (tp->t_flags&RAW || newflags&RAW || com == TIOCSETP) {
-                       ttywait(tp);
-                       ttyflush(tp, FREAD);
-               } else if ((tp->t_flags&CBREAK) != (newflags&CBREAK)) {
-                       if (newflags&CBREAK) {
-                               struct clist tq;
-
-                               catq(&tp->t_rawq, &tp->t_canq);
-                               tq = tp->t_rawq;
-                               tp->t_rawq = tp->t_canq;
-                               tp->t_canq = tq;
-                       } else {
-                               tp->t_flags |= PENDIN;
-                               newflags |= PENDIN;
-                               ttwakeup(tp);
-                       }
-               }
-               tp->t_flags = newflags;
-               if (tp->t_flags&RAW) {
-                       tp->t_state &= ~TS_TTSTOP;
-                       ttstart(tp);
-               }
-               splx(s);
+       case TIOCGETA: {
+               struct termios *t = (struct termios *)data;
+               bcopy(&tp->t_termio, t, sizeof(struct termios));
+               if (tp->t_trace & TTRACE_STATE)
+                       ttytrace(com, tp);
                break;
        }
 
                break;
        }
 
-       /* send current parameters to user */
-       case TIOCGETP: {
-               register struct sgttyb *sg = (struct sgttyb *)data;
-
-               sg->sg_ispeed = tp->t_ispeed;
-               sg->sg_ospeed = tp->t_ospeed;
-               sg->sg_erase = tp->t_erase;
-               sg->sg_kill = tp->t_kill;
-               sg->sg_flags = tp->t_flags;
-               break;
-       }
-
-       case FIONBIO:
-               if (*(int *)data)
-                       tp->t_state |= TS_NBIO;
-               else
-                       tp->t_state &= ~TS_NBIO;
-               break;
+               if (com == TIOCSETAF || com == TIOCSETAFS) 
+                       ttywflush(tp);
+               else {
+                       if (com == TIOCSETAW || com == TIOCSETAWS)
+                               ttywait(tp);
+                       if ((t->c_lflag&ICANON) != (tp->t_lflag&ICANON))
+                               if (t->c_lflag&ICANON) {        
+                                       tp->t_lflag |= PENDIN;
+                                       ttwakeup(tp);
+                               }
+                               else {
+                                       struct clist tq;
 
 
-       case FIOASYNC:
-               if (*(int *)data)
-                       tp->t_state |= TS_ASYNC;
+                                       catq(&tp->t_rawq, &tp->t_canq);
+                                       tq = tp->t_rawq;
+                                       tp->t_rawq = tp->t_canq;
+                                       tp->t_canq = tq;
+                               }
+               }
+               tp->t_iflag = t->c_iflag;
+               tp->t_oflag = t->c_oflag;
+               tp->t_lflag = t->c_lflag;
+               bcopy(t->c_cc, tp->t_cc, sizeof(t->c_cc));
+               if (!soft) {
+                       tp->t_cflag = t->c_cflag;
+                       tp->t_ispeed = t->c_ispeed;
+                       tp->t_ospeed = t->c_ospeed;
+               }
+               tp->t_iflag = t->c_iflag;
+               tp->t_oflag = t->c_oflag;
+               /*
+                * Make the EXTPROC bit read only.
+                */
+               if (tp->t_lflag&EXTPROC)
+                       t->c_lflag |= EXTPROC;
                else
                else
-                       tp->t_state &= ~TS_ASYNC;
-               break;
-
-       case TIOCGETC:
-               bcopy((caddr_t)&tp->t_intrc, data, sizeof (struct tchars));
-               break;
-
-       case TIOCSETC:
-               bcopy(data, (caddr_t)&tp->t_intrc, sizeof (struct tchars));
-               break;
-
-       /* set/get local special characters */
-       case TIOCSLTC:
-               bcopy(data, (caddr_t)&tp->t_suspc, sizeof (struct ltchars));
-               break;
-
-       case TIOCGLTC:
-               bcopy((caddr_t)&tp->t_suspc, data, sizeof (struct ltchars));
-               break;
-
-       /*
-        * Modify local mode word.
-        */
-       case TIOCLBIS:
-               tp->t_flags |= *(int *)data << 16;
-               break;
-
-       case TIOCLBIC:
-               tp->t_flags &= ~(*(int *)data << 16);
-               break;
-
-       case TIOCLSET:
-               tp->t_flags &= 0xffff;
-               tp->t_flags |= *(int *)data << 16;
-               break;
-
-       case TIOCLGET:
-               *(int *)data = ((unsigned) tp->t_flags) >> 16;
+                       t->c_lflag &= ~EXTPROC;
+               tp->t_lflag = t->c_lflag;
+               bcopy(t->c_cc, tp->t_cc, sizeof(t->c_cc));
+               splx(s);
+               if (tp->t_trace & TTRACE_STATE)
+                       ttytrace(com, tp);
                break;
                break;
+       }
 
        /*
 
        /*
-        * Allow SPGRP only if tty is open for reading.
-        * Quick check: if we can find a process in the new pgrp,
-        * this user must own that process.
-        * SHOULD VERIFY THAT PGRP IS IN USE AND IS THIS USER'S.
+        * Set terminal process group.
         */
        case TIOCSPGRP: {
         */
        case TIOCSPGRP: {
-               struct proc *p;
-               int pgrp = *(int *)data;
+               register struct pgrp *pgrp = pgfind(*(int *)data);
 
 
-               if (u.u_uid && (flag & FREAD) == 0)
-                       return (EPERM);
-               p = pfind(pgrp);
-               if (p && p->p_pgrp == pgrp &&
-                   p->p_uid != u.u_uid && u.u_uid && !inferior(p))
+               if (!isctty(p, tp))
+                       return (ENOTTY);
+               else if (pgrp == NULL || pgrp->pg_session != p->p_session)
                        return (EPERM);
                tp->t_pgrp = pgrp;
                break;
        }
 
        case TIOCGPGRP:
                        return (EPERM);
                tp->t_pgrp = pgrp;
                break;
        }
 
        case TIOCGPGRP:
-               *(int *)data = tp->t_pgrp;
+               if (!isctty(p, tp))
+                       return (ENOTTY);
+               *(int *)data = tp->t_pgrp ? tp->t_pgrp->pg_id : NO_PID;
                break;
 
        case TIOCSWINSZ:
                if (bcmp((caddr_t)&tp->t_winsize, data,
                    sizeof (struct winsize))) {
                        tp->t_winsize = *(struct winsize *)data;
                break;
 
        case TIOCSWINSZ:
                if (bcmp((caddr_t)&tp->t_winsize, data,
                    sizeof (struct winsize))) {
                        tp->t_winsize = *(struct winsize *)data;
-                       gsignal(tp->t_pgrp, SIGWINCH);
+                       pgsignal(tp->t_pgrp, SIGWINCH, 1);
                }
                break;
 
                }
                break;
 
@@ -502,21 +509,99 @@ ttioctl(tp, com, data, flag)
                *(struct winsize *)data = tp->t_winsize;
                break;
 
                *(struct winsize *)data = tp->t_winsize;
                break;
 
+       case TIOCCONS:
+               if (*(int *)data) {
+                       if (constty && constty != tp &&
+                           (constty->t_state & (TS_CARR_ON|TS_ISOPEN)) ==
+                           (TS_CARR_ON|TS_ISOPEN))
+                               return (EBUSY);
+#ifndef        UCONSOLE
+                       if (error = suser(p->p_ucred, &p->p_acflag))
+                               return (error);
+#endif
+                       constty = tp;
+               } else if (tp == constty)
+                       constty = NULL;
+               break;
+
+       case TIOCDRAIN:
+               if (error = ttywait(tp))
+                       return (error);
+               break;
+
+       /* allow old ioctls for now */
+       case TIOCGETP:
+       case TIOCSETP:
+       case TIOCSETN:
+       case TIOCGETC:
+       case TIOCSETC:
+       case TIOCSLTC:
+       case TIOCGLTC:
+       case TIOCLBIS:
+       case TIOCLBIC:
+       case TIOCLSET:
+       case TIOCLGET:
+               return(ottioctl(tp, com, data, flag));
+
        default:
        default:
+#ifdef COMPAT_43
+               return (ttcompat(tp, com, data, flag));
+#else
                return (-1);
                return (-1);
+#endif
        }
        return (0);
 }
 
        }
        return (0);
 }
 
+/*
+ * DEBUG - to be removed
+ */
+ttytrace(ioc, tp)
+       struct tty *tp;
+{
+       register u_char *cc = tp->t_cc;
+       char comm[MAXCOMLEN+1];
+       static int seq = 0;
+       
+       bcopy(u.u_comm, comm, MAXCOMLEN+1);
+       comm[MAXCOMLEN] = '\0';
+
+       /* trace changes to line disciplines */
+       if (ioc == TIOCSETD) {
+               log(LOG_LOCAL4|LOG_DEBUG, "%s:%x:%x:%x:%x\n",
+                   comm, ioc, u.u_procp->p_pid, tp->t_dev, tp->t_line);
+               return;
+       }
+
+       /*
+        * format for the trace record is:
+        *
+        * u_comm:ioctl:pid:dev_t:ldisc:iflag:oflag:lflag:cflag:ispeed:
+        *    ospeed:cc's...:seq
+        *
+        * u_comm is a string and all other values are hex. "cc's..."
+        * stands for control chars 0 through NCC-1.  seq is a sequence #
+        * to force syslogd to log every entry (rather than hold them to
+        * print "last message repeated...".
+        */
+       log(LOG_LOCAL4|LOG_DEBUG, "%s:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x:%x\n",
+               comm, ioc, u.u_procp->p_pid, tp->t_dev, tp->t_line,
+               tp->t_iflag, tp->t_oflag, tp->t_lflag, tp->t_cflag,
+               tp->t_ispeed, tp->t_ospeed, cc[0], cc[1], cc[2], cc[3],
+               cc[4], cc[5], cc[6], cc[7], cc[8], cc[9], cc[10], cc[11],
+               cc[12], cc[13], cc[14], cc[15], cc[16], cc[17], cc[18], 
+               cc[19], seq++);
+}
+
 ttnread(tp)
        struct tty *tp;
 {
        int nread = 0;
 
 ttnread(tp)
        struct tty *tp;
 {
        int nread = 0;
 
-       if (tp->t_flags & PENDIN)
+       if (tp->t_lflag & PENDIN)
                ttypend(tp);
        nread = tp->t_canq.c_cc;
                ttypend(tp);
        nread = tp->t_canq.c_cc;
-       if (tp->t_flags & (RAW|CBREAK))
+       if (tp->t_lflag & ICANON == 0)
                nread += tp->t_rawq.c_cc;
        return (nread);
 }
                nread += tp->t_rawq.c_cc;
        return (nread);
 }
@@ -533,21 +618,22 @@ ttselect(dev, rw)
 
        case FREAD:
                nread = ttnread(tp);
 
        case FREAD:
                nread = ttnread(tp);
-               if ((nread > 0) || ((tp->t_state & TS_CARR_ON) == 0))
+               if (nread > 0 || 
+                  ((tp->t_cflag&CLOCAL) == 0 && (tp->t_state&TS_CARR_ON) == 0))
                        goto win;
                if (tp->t_rsel && tp->t_rsel->p_wchan == (caddr_t)&selwait)
                        tp->t_state |= TS_RCOLL;
                else
                        goto win;
                if (tp->t_rsel && tp->t_rsel->p_wchan == (caddr_t)&selwait)
                        tp->t_state |= TS_RCOLL;
                else
-                       tp->t_rsel = u.u_procp;
+                       tp->t_rsel = curproc;
                break;
 
        case FWRITE:
                break;
 
        case FWRITE:
-               if (tp->t_outq.c_cc <= TTLOWAT(tp))
+               if (tp->t_outq.c_cc <= tp->t_lowat)
                        goto win;
                if (tp->t_wsel && tp->t_wsel->p_wchan == (caddr_t)&selwait)
                        tp->t_state |= TS_WCOLL;
                else
                        goto win;
                if (tp->t_wsel && tp->t_wsel->p_wchan == (caddr_t)&selwait)
                        tp->t_state |= TS_WCOLL;
                else
-                       tp->t_wsel = u.u_procp;
+                       tp->t_wsel = curproc;
                break;
        }
        splx(s);
                break;
        }
        splx(s);
@@ -558,31 +644,23 @@ win:
 }
 
 /*
 }
 
 /*
- * Initial open of tty, or (re)entry to line discipline.
- * Establish a process group for distribution of
- * quits and interrupts from the tty.
+ * Initial open of tty, or (re)entry to standard tty line discipline.
  */
 ttyopen(dev, tp)
        dev_t dev;
        register struct tty *tp;
 {
  */
 ttyopen(dev, tp)
        dev_t dev;
        register struct tty *tp;
 {
-       register struct proc *pp;
 
 
-       pp = u.u_procp;
        tp->t_dev = dev;
        tp->t_dev = dev;
-       if (pp->p_pgrp == 0) {
-               u.u_ttyp = tp;
-               u.u_ttyd = dev;
-               if (tp->t_pgrp == 0)
-                       tp->t_pgrp = pp->p_pid;
-               pp->p_pgrp = tp->t_pgrp;
-       }
+
        tp->t_state &= ~TS_WOPEN;
        if ((tp->t_state & TS_ISOPEN) == 0) {
                tp->t_state |= TS_ISOPEN;
                bzero((caddr_t)&tp->t_winsize, sizeof(tp->t_winsize));
        tp->t_state &= ~TS_WOPEN;
        if ((tp->t_state & TS_ISOPEN) == 0) {
                tp->t_state |= TS_ISOPEN;
                bzero((caddr_t)&tp->t_winsize, sizeof(tp->t_winsize));
-               if (tp->t_line != NTTYDISC)
-                       ttywflush(tp);
+               /*
+                * CHANGE: used to do a ttywflush() if it was the
+                *  old (old) line discipline.
+                */
        }
        return (0);
 }
        }
        return (0);
 }
@@ -590,24 +668,33 @@ ttyopen(dev, tp)
 /*
  * "close" a line discipline
  */
 /*
  * "close" a line discipline
  */
-ttylclose(tp)
-       register struct tty *tp;
+ttylclose(tp, flag)
+       struct tty *tp;
+       int flag;
 {
 
 {
 
-       ttywflush(tp);
-       tp->t_line = 0;
+       if (flag&IO_NDELAY)
+               ttyflush(tp, FREAD|FWRITE);
+       else
+               ttywflush(tp);
 }
 
 /*
 }
 
 /*
- * clean tp on last close
+ * Handle close() on a tty line: flush and set to initial state,
+ * bumping generation number so that pending read/write calls
+ * can detect recycling of the tty.
  */
 ttyclose(tp)
        register struct tty *tp;
 {
  */
 ttyclose(tp)
        register struct tty *tp;
 {
-
+       if (constty == tp)
+               constty = NULL;
        ttyflush(tp, FREAD|FWRITE);
        ttyflush(tp, FREAD|FWRITE);
-       tp->t_pgrp = 0;
+       tp->t_session = NULL;
+       tp->t_pgrp = NULL;
        tp->t_state = 0;
        tp->t_state = 0;
+       tp->t_gen++;
+       return (0);
 }
 
 /*
 }
 
 /*
@@ -619,7 +706,7 @@ ttymodem(tp, flag)
        register struct tty *tp;
 {
 
        register struct tty *tp;
 {
 
-       if ((tp->t_state&TS_WOPEN) == 0 && (tp->t_flags & MDMBUF)) {
+       if ((tp->t_state&TS_WOPEN) == 0 && (tp->t_lflag & MDMBUF)) {
                /*
                 * MDMBUF: do flow control according to carrier flag
                 */
                /*
                 * MDMBUF: do flow control according to carrier flag
                 */
@@ -635,20 +722,40 @@ ttymodem(tp, flag)
                 * Lost carrier.
                 */
                tp->t_state &= ~TS_CARR_ON;
                 * Lost carrier.
                 */
                tp->t_state &= ~TS_CARR_ON;
-               if (tp->t_state & TS_ISOPEN) {
-                       if ((tp->t_flags & NOHANG) == 0) {
-                               gsignal(tp->t_pgrp, SIGHUP);
-                               gsignal(tp->t_pgrp, SIGCONT);
-                               ttyflush(tp, FREAD|FWRITE);
-                               return (0);
-                       }
+               if (tp->t_state&TS_ISOPEN && (tp->t_cflag&CLOCAL) == 0) {
+                       if (tp->t_session && tp->t_session->s_leader)
+                               psignal(tp->t_session->s_leader, SIGHUP);
+                       ttyflush(tp, FREAD|FWRITE);
+                       return (0);
                }
        } else {
                /*
                 * Carrier now on.
                 */
                tp->t_state |= TS_CARR_ON;
                }
        } else {
                /*
                 * Carrier now on.
                 */
                tp->t_state |= TS_CARR_ON;
-               wakeup((caddr_t)&tp->t_rawq);
+               ttwakeup(tp);
+       }
+       return (1);
+}
+
+/*
+ * Default modem control routine (for other line disciplines).
+ * Return argument flag, to turn off device on carrier drop.
+ */
+nullmodem(tp, flag)
+       register struct tty *tp;
+       int flag;
+{
+       
+       if (flag)
+               tp->t_state |= TS_CARR_ON;
+       else {
+               tp->t_state &= ~TS_CARR_ON;
+               if ((tp->t_cflag&CLOCAL) == 0) {
+                       if (tp->t_session && tp->t_session->s_leader)
+                               psignal(tp->t_session->s_leader, SIGHUP);
+                       return (0);
+               }
        }
        return (1);
 }
        }
        return (1);
 }
@@ -663,7 +770,7 @@ ttypend(tp)
        struct clist tq;
        register c;
 
        struct clist tq;
        register c;
 
-       tp->t_flags &= ~PENDIN;
+       tp->t_lflag &= ~PENDIN;
        tp->t_state |= TS_TYPEN;
        tq = tp->t_rawq;
        tp->t_rawq.c_cc = 0;
        tp->t_state |= TS_TYPEN;
        tq = tp->t_rawq;
        tp->t_rawq.c_cc = 0;
@@ -674,244 +781,172 @@ ttypend(tp)
 }
 
 /*
 }
 
 /*
- * Place a character on raw TTY input queue,
- * putting in delimiters and waking up top
- * half as needed.  Also echo if required.
- * The arguments are the character and the
- * appropriate tty structure.
+ * Process input of a single character received on a tty.
  */
 ttyinput(c, tp)
        register c;
        register struct tty *tp;
 {
  */
 ttyinput(c, tp)
        register c;
        register struct tty *tp;
 {
-       register int t_flags = tp->t_flags;
-       int i;
+       register int iflag = tp->t_iflag;
+       register int lflag = tp->t_lflag;
+       register u_char *cc = tp->t_cc;
+       int i, err;
 
        /*
         * If input is pending take it first.
         */
 
        /*
         * If input is pending take it first.
         */
-       if (t_flags&PENDIN)
+       if (lflag&PENDIN)
                ttypend(tp);
                ttypend(tp);
-       tk_nin++;
-       c &= 0377;
-
        /*
        /*
-        * In tandem mode, check high water mark.
+        * Gather stats.
         */
         */
-       if (t_flags&TANDEM)
-               ttyblock(tp);
 
 
-       if (t_flags&RAW) {
-               /*
-                * Raw mode, just put character
-                * in input q w/o interpretation.
-                */
-               if (tp->t_rawq.c_cc > TTYHOG) 
-                       ttyflush(tp, FREAD|FWRITE);
-               else {
-                       if (putc(c, &tp->t_rawq) >= 0)
-                               ttwakeup(tp);
-                       ttyecho(c, tp);
+       tk_nin++;
+       if (lflag&ICANON) {
+               tk_cancc++;
+               tp->t_cancc++;
+       } else {
+               tk_rawcc++;
+               tp->t_rawcc++;
+       }
+       /*
+        * Handle exceptional conditions (break, parity, framing).
+        */
+       if (err = (c&TTY_ERRORMASK)) {
+               c &= TTY_CHARMASK;
+               if (err&TTY_FE && !c) {         /* break */
+                       if (iflag&IGNBRK)
+                               goto endcase;
+                       else if (iflag&BRKINT && lflag&ISIG && 
+                               (cc[VINTR] != POSIX_V_DISABLE))
+                               c = cc[VINTR];
+                       else
+                               c = 0;
+               } else if ((err&TTY_PE && iflag&INPCK) || err&TTY_FE) {
+                       if (iflag&IGNPAR)
+                               goto endcase;
+                       else if (iflag&PARMRK) {
+                               ttyinput(0377, tp);
+                               ttyinput(0, tp);
+                       } else
+                               c = 0;
                }
                }
-               goto endcase;
        }
        }
+       dprintf("<%o>\n", c);
 
        /*
 
        /*
-        * Ignore any high bit added during
-        * previous ttyinput processing.
+        * In tandem mode, check high water mark.
         */
         */
-       if ((tp->t_state&TS_TYPEN) == 0 && (t_flags&PASS8) == 0)
-               c &= 0177;
+       if (iflag&IXOFF)
+               ttyblock(tp);
+
        /*
        /*
-        * Check for literal nexting very first
+        * In tandem mode, check high water mark.
         */
         */
-       if (tp->t_state&TS_LNCH) {
-               c |= 0200;
-               tp->t_state &= ~TS_LNCH;
-       }
+       if ((tp->t_state&TS_TYPEN) == 0 && (iflag&ISTRIP))
+               c &= ~0x80;
 
        /*
 
        /*
-        * Scan for special characters.  This code
-        * is really just a big case statement with
-        * non-constant cases.  The bottom of the
-        * case statement is labeled ``endcase'', so goto
-        * it after a case match, or similar.
+        * Extensions to POSIX input modes which aren't controlled
+        * by ICANON, ISIG, or IXON.
         */
         */
-       if (tp->t_line == NTTYDISC) {
-               if (c == tp->t_lnextc) {
-                       if (t_flags&ECHO)
-                               ttyout("^\b", tp);
-                       tp->t_state |= TS_LNCH;
-                       goto endcase;
+       if (iflag&IEXTEN) {
+               if (CCEQ(cc[VLNEXT],c) && (iflag&ISTRIP)) {
+                       if (lflag&ECHO)
+                               ttyout("^\b", tp); /*XXX - presumes too much */
                }
                }
-               if (c == tp->t_flushc) {
-                       if (t_flags&FLUSHO)
-                               tp->t_flags &= ~FLUSHO;
-                       else {
-                               ttyflush(tp, FWRITE);
+               /*
+                * Signals.
+                */
+               if (lflag&ISIG) {
+                       if (CCEQ(cc[VINTR], c) || CCEQ(cc[VQUIT], c)) {
+                               if ((lflag&NOFLSH) == 0)
+                                       ttyflush(tp, FREAD|FWRITE);
                                ttyecho(c, tp);
                                ttyecho(c, tp);
-                               if (tp->t_rawq.c_cc + tp->t_canq.c_cc)
-                                       ttyretype(tp);
-                               tp->t_flags |= FLUSHO;
+                               tp->t_lflag |= FLUSHO;
+                       }
+                       if (CCEQ(cc[VSUSP], c)) {
+                               if ((lflag&NOFLSH) == 0)
+                                       ttyflush(tp, FREAD);
+                               ttyecho(c, tp);
+                               pgsignal(tp->t_pgrp, SIGTSTP, 1);
+                               goto endcase;
                        }
                        }
-                       goto startoutput;
                }
                }
-               if (c == tp->t_suspc) {
-                       if ((t_flags&NOFLSH) == 0)
-                               ttyflush(tp, FREAD);
-                       ttyecho(c, tp);
-                       gsignal(tp->t_pgrp, SIGTSTP);
+       if (iflag&IXON) {
+               if (CCEQ(cc[VSTOP],c)) {
+                       if ((tp->t_state&TS_TTSTOP) == 0) {
+                               tp->t_state |= TS_TTSTOP;
+                               (*cdevsw[major(tp->t_dev)].d_stop)(tp, 0);
+                               return;
+                       }
+                       if (!CCEQ(cc[VSTART], c))
+                               return;
+                       /* 
+                        * if VSTART == VSTOP we toggle 
+                        */
                        goto endcase;
                }
                        goto endcase;
                }
+               if (CCEQ(cc[VSTART], c))
+                       goto restartoutput;
        }
        }
-
-       /*
-        * Handle start/stop characters.
-        */
-       if (c == tp->t_stopc) {
-               if ((tp->t_state&TS_TTSTOP) == 0) {
-                       tp->t_state |= TS_TTSTOP;
-                       (*cdevsw[major(tp->t_dev)].d_stop)(tp, 0);
-                       return;
-               }
-               if (c != tp->t_startc)
-                       return;
+                       c = unputc(&tp->t_rawq);
+               } while (c != ' ' && c != '\t');
+               (void) putc(c, &tp->t_rawq);
                goto endcase;
        }
                goto endcase;
        }
-       if (c == tp->t_startc)
-               goto restartoutput;
-
        /*
        /*
-        * Look for interrupt/quit chars.
+        * reprint line (^R)
         */
         */
-       if (c == tp->t_intrc || c == tp->t_quitc) {
-               if ((t_flags&NOFLSH) == 0)
-                       ttyflush(tp, FREAD|FWRITE);
-               ttyecho(c, tp);
-               gsignal(tp->t_pgrp, c == tp->t_intrc ? SIGINT : SIGQUIT);
+       if (CCEQ(cc[VREPRINT], c)) {
+               ttyretype(tp);
                goto endcase;
        }
                goto endcase;
        }
-
-       if (tp->t_flags & LCASE && c <= 0177) {
-               if (tp->t_state&TS_BKSL) {
-                       ttyrub(unputc(&tp->t_rawq), tp);
-                       if (maptab[c])
-                               c = maptab[c];
-                       c |= 0200;
-                       tp->t_state &= ~(TS_BKSL|TS_QUOT);
-               } else if (c >= 'A' && c <= 'Z')
-                       c += 'a' - 'A';
-               else if (c == '\\')
-                       tp->t_state |= TS_BKSL;
-       }
-
-       /*
-        * Cbreak mode, don't process line editing
-        * characters; check high water mark for wakeup.
-        */
-       if (t_flags&CBREAK) {
-               if (tp->t_rawq.c_cc > TTYHOG) {
-                       if (tp->t_outq.c_cc < TTHIWAT(tp) &&
-                           tp->t_line == NTTYDISC)
-                               (void) ttyoutput(CTRL(g), tp);
-               } else if (putc(c, &tp->t_rawq) >= 0) {
-                       ttwakeup(tp);
-                       ttyecho(c, tp);
-               }
-               goto endcase;
-       }
-
-       /*
-        * From here on down cooked mode character
-        * processing takes place.
-        */
-       if ((tp->t_state&TS_QUOT) &&
-           (c == tp->t_erase || c == tp->t_kill)) {
-               ttyrub(unputc(&tp->t_rawq), tp);
-               c |= 0200;
-       }
-       if (c == tp->t_erase) {
-               if (tp->t_rawq.c_cc)
-                       ttyrub(unputc(&tp->t_rawq), tp);
-               goto endcase;
-       }
-       if (c == tp->t_kill) {
-               if (t_flags&CRTKIL &&
-                   tp->t_rawq.c_cc == tp->t_rocount) {
-                       while (tp->t_rawq.c_cc)
-                               ttyrub(unputc(&tp->t_rawq), tp);
-               } else {
-                       ttyecho(c, tp);
-                       ttyecho('\n', tp);
-                       while (getc(&tp->t_rawq) > 0)
-                               ;
-                       tp->t_rocount = 0;
-               }
-               tp->t_state &= ~TS_LOCAL;
-               goto endcase;
-       }
-
-       /*
-        * New line discipline,
-        * check word erase/reprint line.
-        */
-       if (tp->t_line == NTTYDISC) {
-               if (c == tp->t_werasc) {
-                       if (tp->t_rawq.c_cc == 0)
-                               goto endcase;
-                       do {
-                               c = unputc(&tp->t_rawq);
-                               if (c != ' ' && c != '\t')
-                                       goto erasenb;
-                               ttyrub(c, tp);
-                       } while (tp->t_rawq.c_cc);
-                       goto endcase;
-       erasenb:
-                       do {
-                               ttyrub(c, tp);
-                               if (tp->t_rawq.c_cc == 0)
-                                       goto endcase;
-                               c = unputc(&tp->t_rawq);
-                       } while (c != ' ' && c != '\t');
-                       (void) putc(c, &tp->t_rawq);
-                       goto endcase;
-               }
-               if (c == tp->t_rprntc) {
-                       ttyretype(tp);
-                       goto endcase;
-               }
-       }
-
        /*
         * Check for input buffer overflow
         */
        /*
         * Check for input buffer overflow
         */
-       if (tp->t_rawq.c_cc+tp->t_canq.c_cc >= TTYHOG) {
-               if (tp->t_line == NTTYDISC)
-                       (void) ttyoutput(CTRL(g), tp);
+       if (tp->t_rawq.c_cc + tp->t_canq.c_cc >= TTYHOG) {
+               if (iflag&IMAXBEL) {
+                       if (tp->t_outq.c_cc < TTHIWAT(tp))
+                               (void) ttyoutput(CTRL('g'), tp);
+               } else
+                       ttyflush(tp, FREAD | FWRITE);
                goto endcase;
        }
                goto endcase;
        }
-
        /*
         * Put data char in q for user and
         * wakeup on seeing a line delimiter.
         */
        if (putc(c, &tp->t_rawq) >= 0) {
        /*
         * Put data char in q for user and
         * wakeup on seeing a line delimiter.
         */
        if (putc(c, &tp->t_rawq) >= 0) {
-               if (ttbreakc(c, tp)) {
+               if ((lflag&ICANON) == 0) {
+                       ttwakeup(tp);
+                       ttyecho(c, tp);
+                       goto endcase;
+               }
+               if (ttbreakc(c)) {
                        tp->t_rocount = 0;
                        catq(&tp->t_rawq, &tp->t_canq);
                        ttwakeup(tp);
                } else if (tp->t_rocount++ == 0)
                        tp->t_rocol = tp->t_col;
                        tp->t_rocount = 0;
                        catq(&tp->t_rawq, &tp->t_canq);
                        ttwakeup(tp);
                } else if (tp->t_rocount++ == 0)
                        tp->t_rocol = tp->t_col;
-               tp->t_state &= ~TS_QUOT;
-               if (c == '\\')
-                       tp->t_state |= TS_QUOT;
+               if (CCEQ(cc[VQUOTE], c) && (iflag&ISTRIP))
+                       tp->t_state |= TS_QUOT; /* '\' escape */
                if (tp->t_state&TS_ERASE) {
                if (tp->t_state&TS_ERASE) {
+                       /*
+                        * end of prterase \.../
+                        */
+                       /*
+                        * end of prterase \.../
+                        */
                        tp->t_state &= ~TS_ERASE;
                        (void) ttyoutput('/', tp);
                }
                i = tp->t_col;
                ttyecho(c, tp);
                        tp->t_state &= ~TS_ERASE;
                        (void) ttyoutput('/', tp);
                }
                i = tp->t_col;
                ttyecho(c, tp);
-               if (c == tp->t_eofc && t_flags&ECHO) {
+               if (CCEQ(cc[VEOF], c) && lflag&ECHO) {
+                       /*
+                        * Place the cursor over the '^' of the ^D.
+                        */
                        i = MIN(2, tp->t_col - i);
                        while (i > 0) {
                                (void) ttyoutput('\b', tp);
                        i = MIN(2, tp->t_col - i);
                        while (i > 0) {
                                (void) ttyoutput('\b', tp);
@@ -921,313 +956,230 @@ ttyinput(c, tp)
        }
 endcase:
        /*
        }
 endcase:
        /*
-        * If DEC-style start/stop is enabled don't restart
-        * output until seeing the start character.
+        * IXANY means allow any character to restart output.
         */
         */
-       if (t_flags&DECCTQ && tp->t_state&TS_TTSTOP &&
-           tp->t_startc != tp->t_stopc)
+       if (tp->t_state&TS_TTSTOP && (iflag&IXANY == 0) 
+           && cc[VSTART] != cc[VSTOP])
                return;
                return;
+       
 restartoutput:
        tp->t_state &= ~TS_TTSTOP;
 restartoutput:
        tp->t_state &= ~TS_TTSTOP;
-       tp->t_flags &= ~FLUSHO;
+       tp->t_lflag &= ~FLUSHO;
 startoutput:
        ttstart(tp);
 }
 
 /*
 startoutput:
        ttstart(tp);
 }
 
 /*
- * Put character on TTY output queue, adding delays,
- * expanding tabs, and handling the CR/NL bit.
- * This is called both from the top half for output,
- * and from interrupt level for echoing.
- * The arguments are the character and the tty structure.
- * Returns < 0 if putc succeeds, otherwise returns char to resend
+ * Output a single character on a tty, doing output processing
+ * as needed (expanding tabs, newline processing, etc.).
+ * Returns < 0 if putc succeeds, otherwise returns char to resend.
  * Must be recursive.
  */
 ttyoutput(c, tp)
        register c;
        register struct tty *tp;
 {
  * Must be recursive.
  */
 ttyoutput(c, tp)
        register c;
        register struct tty *tp;
 {
-       register char *colp;
-       register ctype;
-
-       if (tp->t_flags & (RAW|LITOUT)) {
-               if (tp->t_flags&FLUSHO)
+       register int col;
+       if (!(tp->t_oflag&OPOST)) {
+               if (tp->t_lflag&FLUSHO) 
                        return (-1);
                if (putc(c, &tp->t_outq))
                        return (c);
                tk_nout++;
                        return (-1);
                if (putc(c, &tp->t_outq))
                        return (c);
                tk_nout++;
+               tp->t_outcc++;
                return (-1);
        }
                return (-1);
        }
-
-       /*
-        * Ignore EOT in normal mode to avoid
-        * hanging up certain terminals.
-        */
-       c &= 0177;
-       if (c == CEOT && (tp->t_flags&CBREAK) == 0)
-               return (-1);
+       c &= 0377;
        /*
        /*
-        * Turn tabs to spaces as required
+        * Do tab expansion if OXTABS is set.
+        * Special case if we have external processing, we don't
+        * do the tab expansion because we'll probably get it
+        * wrong.  If tab expansion needs to be done, let it
+        * happen externally.
         */
         */
-       if (c == '\t' && (tp->t_flags&TBDELAY) == XTABS) {
+       if (c == '\t' && tp->t_oflag&OXTABS ) {
                register int s;
 
                c = 8 - (tp->t_col&7);
                register int s;
 
                c = 8 - (tp->t_col&7);
-               if ((tp->t_flags&FLUSHO) == 0) {
+               if ((tp->t_lflag&FLUSHO) == 0) {
                        s = spltty();           /* don't interrupt tabs */
                        c -= b_to_q("        ", c, &tp->t_outq);
                        tk_nout += c;
                        s = spltty();           /* don't interrupt tabs */
                        c -= b_to_q("        ", c, &tp->t_outq);
                        tk_nout += c;
+                       tp->t_outcc += c;
                        splx(s);
                }
                tp->t_col += c;
                return (c ? -1 : '\t');
        }
                        splx(s);
                }
                tp->t_col += c;
                return (c ? -1 : '\t');
        }
+       if (c == CEOT && oflag&ONOEOT)
+               return (-1);
        tk_nout++;
        tk_nout++;
+       tp->t_outcc++;
+#ifdef notdef
        /*
        /*
-        * for upper-case-only terminals,
-        * generate escapes.
+        * Newline translation: if ONLCR is set,
+        * translate newline into "\r\n".
         */
         */
-       if (tp->t_flags&LCASE) {
-               colp = "({)}!|^~'`";
-               while (*colp++)
-                       if (c == *colp++) {
-                               if (ttyoutput('\\', tp) >= 0)
-                                       return (c);
-                               c = colp[-2];
-                               break;
-                       }
-               if ('A' <= c && c <= 'Z') {
-                       if (ttyoutput('\\', tp) >= 0)
-                               return (c);
-               } else if ('a' <= c && c <= 'z')
-                       c += 'A' - 'a';
-       }
-
-       /*
-        * turn <nl> to <cr><lf> if desired.
-        */
-       if (c == '\n' && tp->t_flags&CRMOD)
-               if (ttyoutput('\r', tp) >= 0)
-                       return (c);
-       if (c == '~' && tp->t_flags&TILDE)
-               c = '`';
-       if ((tp->t_flags&FLUSHO) == 0 && putc(c, &tp->t_outq))
+#endif
+       if ((tp->t_lflag&FLUSHO) == 0 && putc(c, &tp->t_outq))
+               return (c);
+       if ((tp->t_lflag&FLUSHO) == 0 && putc(c, &tp->t_outq))
                return (c);
                return (c);
-       /*
-        * Calculate delays.
-        * The numbers here represent clock ticks
-        * and are not necessarily optimal for all terminals.
-        * The delays are indicated by characters above 0200.
-        * In raw mode there are no delays and the
-        * transmission path is 8 bits wide.
-        *
-        * SHOULD JUST ALLOW USER TO SPECIFY DELAYS
-        */
-       colp = &tp->t_col;
-       ctype = partab[c];
-       c = 0;
-       switch (ctype&077) {
+
+       col = tp->t_col;
+       switch (CCLASS(c)) {
 
        case ORDINARY:
 
        case ORDINARY:
-               (*colp)++;
+               col++;
 
        case CONTROL:
                break;
 
        case BACKSPACE:
 
        case CONTROL:
                break;
 
        case BACKSPACE:
-               if (*colp)
-                       (*colp)--;
+               if (col > 0)
+                       col--;
                break;
 
                break;
 
-       /*
-        * This macro is close enough to the correct thing;
-        * it should be replaced by real user settable delays
-        * in any event...
-        */
-#define        mstohz(ms)      (((ms) * hz) >> 10)
        case NEWLINE:
        case NEWLINE:
-               ctype = (tp->t_flags >> 8) & 03;
-               if (ctype == 1) { /* tty 37 */
-                       if (*colp > 0)
-                               c = max((((unsigned)*colp) >> 4) + 3,
-                                   (unsigned)6);
-               } else if (ctype == 2) /* vt05 */
-                       c = mstohz(100);
-               *colp = 0;
+               col = 0;
                break;
 
        case TAB:
                break;
 
        case TAB:
-               ctype = (tp->t_flags >> 10) & 03;
-               if (ctype == 1) { /* tty 37 */
-                       c = 1 - (*colp | ~07);
-                       if (c < 5)
-                               c = 0;
-               }
-               *colp |= 07;
-               (*colp)++;
-               break;
-
-       case VTAB:
-               if (tp->t_flags&VTDELAY) /* tty 37 */
-                       c = 0177;
+               col = (col + 8) &~ 0x7;
                break;
 
        case RETURN:
                break;
 
        case RETURN:
-               ctype = (tp->t_flags >> 12) & 03;
-               if (ctype == 1) /* tn 300 */
-                       c = mstohz(83);
-               else if (ctype == 2) /* ti 700 */
-                       c = mstohz(166);
-               else if (ctype == 3) { /* concept 100 */
-                       int i;
-
-                       if ((i = *colp) >= 0)
-                               for (; i < 9; i++)
-                                       (void) putc(0177, &tp->t_outq);
-               }
-               *colp = 0;
+               col = 0;
        }
        }
-       if (c && (tp->t_flags&FLUSHO) == 0)
-               (void) putc(c|0200, &tp->t_outq);
+       tp->t_col = col;
        return (-1);
 }
        return (-1);
 }
-#undef mstohz
 
 /*
 
 /*
- * Called from device's read routine after it has
- * calculated the tty-structure given as argument.
+ * Process a read call on a tty device.
  */
  */
-ttread(tp, uio)
+ttread(tp, uio, flag)
        register struct tty *tp;
        struct uio *uio;
 {
        register struct clist *qp;
        register struct tty *tp;
        struct uio *uio;
 {
        register struct clist *qp;
-       register c, t_flags;
+       register int c, t_flags;
+       register long lflag = tp->t_lflag;
+       register long iflag = tp->t_iflag;
+       register u_char *cc = tp->t_cc;
        int s, first, error = 0;
 
        int s, first, error = 0;
 
+
 loop:
 loop:
+       lflag = tp->t_lflag;
+       s = spltty();
        /*
        /*
-        * Take any pending input first.
+        * take pending input first 
         */
         */
-       s = spltty();
-       if (tp->t_flags&PENDIN)
+       if (tp->t_lflag&PENDIN)
                ttypend(tp);
        splx(s);
 
                ttypend(tp);
        splx(s);
 
-       if ((tp->t_state&TS_CARR_ON)==0)
-               return (EIO);
-
        /*
         * Hang process if it's in the background.
         */
        /*
         * Hang process if it's in the background.
         */
-       if (tp == u.u_ttyp && u.u_procp->p_pgrp != tp->t_pgrp) {
-               if ((u.u_procp->p_sigignore & sigmask(SIGTTIN)) ||
-                  (u.u_procp->p_sigmask & sigmask(SIGTTIN)) ||
-                   u.u_procp->p_flag&SVFORK)
+       if (isbackground(p, tp)) {
+               if ((p->p_sigignore & sigmask(SIGTTIN)) ||
+                  (p->p_sigmask & sigmask(SIGTTIN)) ||
+                   p->p_flag&SPPWAIT || p->p_pgrp->pg_jobc == 0)
                        return (EIO);
                        return (EIO);
-               gsignal(u.u_procp->p_pgrp, SIGTTIN);
-               sleep((caddr_t)&lbolt, TTIPRI);
+               pgsignal(p->p_pgrp, SIGTTIN, 1);
+               if (error = ttysleep(tp, (caddr_t)&lbolt, TTIPRI | PCATCH, 
+                   ttybg, 0)) 
+                       return (error);
                goto loop;
        }
                goto loop;
        }
-       t_flags = tp->t_flags;
 
        /*
 
        /*
-        * In raw mode take characters directly from the
-        * raw queue w/o processing.  Interlock against
-        * device interrupts when interrogating rawq.
+        * If canonical, use the canonical queue,
+        * else use the raw queue.
         */
         */
-       if (t_flags&RAW) {
-               s = spltty();
-               if (tp->t_rawq.c_cc <= 0) {
-                       if ((tp->t_state&TS_CARR_ON) == 0 ||
-                           (tp->t_state&TS_NBIO)) {
-                               splx(s);
-                               return (EWOULDBLOCK);
-                       }
-                       sleep((caddr_t)&tp->t_rawq, TTIPRI);
-                       splx(s);
-                       goto loop;
-               }
-               splx(s);
-               while (!error && tp->t_rawq.c_cc && uio->uio_resid)
-                       error = ureadc(getc(&tp->t_rawq), uio);
-               goto checktandem;
-       }
-
-       /*
-        * In cbreak mode use the rawq, otherwise
-        * take characters from the canonicalized q.
-        */
-       qp = t_flags&CBREAK ? &tp->t_rawq : &tp->t_canq;
+       qp = lflag&ICANON ? &tp->t_canq : &tp->t_rawq;
 
        /*
 
        /*
-        * No input, sleep on rawq awaiting hardware
-        * receipt and notification.
+        * If there is no input, sleep on rawq
+        * awaiting hardware receipt and notification.
+        * If we have data, we don't need to check for carrier.
         */
        s = spltty();
        if (qp->c_cc <= 0) {
         */
        s = spltty();
        if (qp->c_cc <= 0) {
-               if ((tp->t_state&TS_CARR_ON) == 0 ||
-                   (tp->t_state&TS_NBIO)) {
+               int carrier;
+
+               carrier = (tp->t_state&TS_CARR_ON) || (tp->t_cflag&CLOCAL);
+               if (!carrier && tp->t_state&TS_ISOPEN) {
+                       splx(s);
+                       return (0);     /* EOF */
+               }
+               if (flag & IO_NDELAY) {
                        splx(s);
                        return (EWOULDBLOCK);
                }
                        splx(s);
                        return (EWOULDBLOCK);
                }
-               sleep((caddr_t)&tp->t_rawq, TTIPRI);
+               error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
+                   carrier ? ttyin : ttopen, 0);
                splx(s);
                splx(s);
+               if (error)
+                       return (error);
                goto loop;
        }
        splx(s);
 
        /*
                goto loop;
        }
        splx(s);
 
        /*
-        * Input present, perform input mapping
-        * and processing (we're not in raw mode).
+        * Input present, check for input mapping and processing.
         */
        first = 1;
        while ((c = getc(qp)) >= 0) {
         */
        first = 1;
        while ((c = getc(qp)) >= 0) {
-               if (t_flags&CRMOD && c == '\r')
-                       c = '\n';
                /*
                /*
-                * Check for delayed suspend character.
+                * delayed suspend (^Y)
                 */
                 */
-               if (tp->t_line == NTTYDISC && c == tp->t_dsuspc) {
-                       gsignal(tp->t_pgrp, SIGTSTP);
+               if (CCEQ(cc[VDSUSP], c) && lflag&ISIG) {
+                       pgsignal(tp->t_pgrp, SIGTSTP, 1);
                        if (first) {
                        if (first) {
-                               sleep((caddr_t)&lbolt, TTIPRI);
+                               if (error = ttysleep(tp, (caddr_t)&lbolt,
+                                   TTIPRI | PCATCH, ttybg, 0))
+                                       break;
                                goto loop;
                        }
                        break;
                }
                /*
                                goto loop;
                        }
                        break;
                }
                /*
-                * Interpret EOF only in cooked mode.
+                * Interpret EOF only in canonical mode.
                 */
                 */
-               if (c == tp->t_eofc && (t_flags&CBREAK) == 0)
+               if (CCEQ(cc[VEOF], c) && lflag&ICANON)
                        break;
                /*
                 * Give user character.
                 */
                        break;
                /*
                 * Give user character.
                 */
-               error = ureadc(t_flags&PASS8 ? c : c & 0177, uio);
+               error = ureadc(iflag&ISTRIP ? c & 0177 : c , uio);
                if (error)
                        break;
                if (uio->uio_resid == 0)
                        break;
                /*
                if (error)
                        break;
                if (uio->uio_resid == 0)
                        break;
                /*
-                * In cooked mode check for a "break character"
+                * In canonical mode check for a "break character"
                 * marking the end of a "line of input".
                 */
                 * marking the end of a "line of input".
                 */
-               if ((t_flags&CBREAK) == 0 && ttbreakc(c, tp))
+               if (lflag&ICANON && ttbreakc(c)) {
                        break;
                        break;
+               }
                first = 0;
        }
                first = 0;
        }
-
-checktandem:
        /*
         * Look to unblock output now that (presumably)
         * the input queue has gone down.
         */
        /*
         * Look to unblock output now that (presumably)
         * the input queue has gone down.
         */
-       if (tp->t_state&TS_TBLOCK && tp->t_rawq.c_cc < TTYHOG/5)
-               if (putc(tp->t_startc, &tp->t_outq) == 0) {
+       if (tp->t_state&TS_TBLOCK && tp->t_rawq.c_cc < TTYHOG/5) {
+               if (cc[VSTART] != POSIX_V_DISABLE 
+                  && putc(cc[VSTART], &tp->t_outq) == 0) {
                        tp->t_state &= ~TS_TBLOCK;
                        ttstart(tp);
                }
                        tp->t_state &= ~TS_TBLOCK;
                        ttstart(tp);
                }
+       }
+       }
        return (error);
 }
 
        return (error);
 }
 
@@ -1236,117 +1188,115 @@ checktandem:
  * (from uprintf/tprintf).  Allow some space over the normal
  * hiwater mark so we don't lose messages due to normal flow
  * control, but don't let the tty run amok.
  * (from uprintf/tprintf).  Allow some space over the normal
  * hiwater mark so we don't lose messages due to normal flow
  * control, but don't let the tty run amok.
+ * Sleeps here are not interruptible, but we return prematurely
+ * if new signals come in.
  */
 ttycheckoutq(tp, wait)
        register struct tty *tp;
        int wait;
 {
  */
 ttycheckoutq(tp, wait)
        register struct tty *tp;
        int wait;
 {
-       int hiwat, s;
+       int hiwat, s, oldsig;
+       extern int wakeup();
 
 
-       hiwat = TTHIWAT(tp);
+       hiwat = tp->t_hiwat;
        s = spltty();
        s = spltty();
+       if (wait)
+               oldsig = curproc->p_sig;
        if (tp->t_outq.c_cc > hiwat + 200)
        if (tp->t_outq.c_cc > hiwat + 200)
-           while (tp->t_outq.c_cc > hiwat) {
-               ttstart(tp);
-               if (wait == 0) {
-                       splx(s);
-                       return (0);
+               while (tp->t_outq.c_cc > hiwat) {
+                       ttstart(tp);
+                       if (wait == 0 || curproc->p_sig != oldsig) {
+                               splx(s);
+                               return (0);
+                       }
+                       timeout(wakeup, (caddr_t)&tp->t_outq, hz);
+                       tp->t_state |= TS_ASLEEP;
+                       sleep((caddr_t)&tp->t_outq, PZERO - 1);
                }
                }
-               tp->t_state |= TS_ASLEEP;
-               sleep((caddr_t)&tp->t_outq, TTOPRI);
-       }
        splx(s);
        return (1);
 }
 
 /*
        splx(s);
        return (1);
 }
 
 /*
- * Called from the device's write routine after it has
- * calculated the tty-structure given as argument.
+ * Process a write call on a tty device.
  */
  */
-ttwrite(tp, uio)
+ttwrite(tp, uio, flag)
        register struct tty *tp;
        register struct uio *uio;
 {
        register char *cp;
        register struct tty *tp;
        register struct uio *uio;
 {
        register char *cp;
-       register int cc, ce, c;
+       register int cc = 0, ce;
+       register struct proc *p = curproc;
        int i, hiwat, cnt, error, s;
        char obuf[OBUFSIZ];
 
        int i, hiwat, cnt, error, s;
        char obuf[OBUFSIZ];
 
-       hiwat = TTHIWAT(tp);
+       hiwat = tp->t_hiwat;
        cnt = uio->uio_resid;
        error = 0;
 loop:
        cnt = uio->uio_resid;
        error = 0;
 loop:
-       if ((tp->t_state&TS_CARR_ON) == 0)
-               return (EIO);
+       s = spltty();
+       if ((tp->t_state&TS_CARR_ON) == 0 && (tp->t_cflag&CLOCAL) == 0) {
+               if (tp->t_state&TS_ISOPEN) {
+                       splx(s);
+                       return (EIO);
+               } else if (flag & IO_NDELAY) {
+                       splx(s);
+                       error = EWOULDBLOCK;
+                       goto out;
+               } else {
+                       /*
+                        * sleep awaiting carrier
+                        */
+                       error = ttysleep(tp, (caddr_t)&tp->t_rawq, 
+                                       TTIPRI | PCATCH,ttopen, 0);
+                       splx(s);
+                       if (error)
+                               goto out;
+                       goto loop;
+               }
+       }
+       splx(s);
        /*
         * Hang the process if it's in the background.
         */
        /*
         * Hang the process if it's in the background.
         */
-       if (u.u_procp->p_pgrp != tp->t_pgrp && tp == u.u_ttyp &&
-           (tp->t_flags&TOSTOP) && (u.u_procp->p_flag&SVFORK)==0 &&
-           !(u.u_procp->p_sigignore & sigmask(SIGTTOU)) &&
-           !(u.u_procp->p_sigmask & sigmask(SIGTTOU))) {
-               gsignal(u.u_procp->p_pgrp, SIGTTOU);
-               sleep((caddr_t)&lbolt, TTIPRI);
+       if (isbackground(p, tp) && 
+           tp->t_lflag&TOSTOP && (p->p_flag&SPPWAIT) == 0 &&
+           (p->p_sigignore & sigmask(SIGTTOU)) == 0 &&
+           (p->p_sigmask & sigmask(SIGTTOU)) == 0 &&
+            p->p_pgrp->pg_jobc) {
+               pgsignal(p->p_pgrp, SIGTTOU, 1);
+               if (error = ttysleep(tp, (caddr_t)&lbolt, TTIPRI | PCATCH, 
+                   ttybg, 0))
+                       goto out;
                goto loop;
        }
                goto loop;
        }
-
        /*
         * Process the user's data in at most OBUFSIZ
        /*
         * Process the user's data in at most OBUFSIZ
-        * chunks.  Perform lower case simulation and
-        * similar hacks.  Keep track of high water
-        * mark, sleep on overflow awaiting device aid
-        * in acquiring new space.
+        * chunks.  Perform any output translation.
+        * Keep track of high water mark, sleep on overflow
+        * awaiting device aid in acquiring new space.
         */
         */
-       while (uio->uio_resid > 0) {
-               /*
-                * Grab a hunk of data from the user.
-                */
-               cc = uio->uio_iov->iov_len;
-               if (cc == 0) {
-                       uio->uio_iovcnt--;
-                       uio->uio_iov++;
-                       if (uio->uio_iovcnt <= 0)
-                               panic("ttwrite");
-                       continue;
+       while (uio->uio_resid > 0 || cc > 0) {
+               if (tp->t_lflag&FLUSHO) {
+                       uio->uio_resid = 0;
+                       return (0);
                }
                }
-               if (cc > OBUFSIZ)
-                       cc = OBUFSIZ;
-               cp = obuf;
-               error = uiomove(cp, cc, UIO_WRITE, uio);
-               if (error)
-                       break;
                if (tp->t_outq.c_cc > hiwat)
                        goto ovhiwat;
                if (tp->t_outq.c_cc > hiwat)
                        goto ovhiwat;
-               if (tp->t_flags&FLUSHO)
-                       continue;
                /*
                /*
-                * If we're mapping lower case or kludging tildes,
-                * then we've got to look at each character, so
-                * just feed the stuff to ttyoutput...
+                * Grab a hunk of data from the user,
+                * unless we have some leftover from last time.
                 */
                 */
-               if (tp->t_flags & (LCASE|TILDE)) {
-                       while (cc > 0) {
-                               c = *cp++;
-                               tp->t_rocount = 0;
-                               while ((c = ttyoutput(c, tp)) >= 0) {
-                                       /* out of clists, wait a bit */
-                                       ttstart(tp);
-                                       sleep((caddr_t)&lbolt, TTOPRI);
-                                       tp->t_rocount = 0;
-                                       if (cc != 0) {
-                                               uio->uio_iov->iov_base -= cc;
-                                               uio->uio_iov->iov_len += cc;
-                                               uio->uio_resid += cc;
-                                               uio->uio_offset -= cc;
-                                       }
-                                       goto loop;
-                               }
-                               --cc;
-                               if (tp->t_outq.c_cc > hiwat)
-                                       goto ovhiwat;
+               if (cc == 0) {
+                       cc = min(uio->uio_resid, OBUFSIZ);
+                       cp = obuf;
+                       error = uiomove(cp, cc, uio);
+                       if (error) {
+                               cc = 0;
+                               break;
                        }
                        }
-                       continue;
                }
                }
+#ifdef notdef
                /*
                 * If nothing fancy need be done, grab those characters we
                 * can handle without any of ttyoutput's processing and
                /*
                 * If nothing fancy need be done, grab those characters we
                 * can handle without any of ttyoutput's processing and
@@ -1357,11 +1307,11 @@ loop:
                 * immediately.
                 */
                while (cc > 0) {
                 * immediately.
                 */
                while (cc > 0) {
-                       if (tp->t_flags & (RAW|LITOUT))
+                       if (!(tp->t_oflag&OPOST))
                                ce = cc;
                        else {
                                ce = cc;
                        else {
-                               ce = cc - scanc((unsigned)cc, (caddr_t)cp,
-                                  (caddr_t)partab, 077);
+                               ce = cc - scanc((unsigned)cc, (u_char *)cp,
+                                  (u_char *)partab, CCLASSMASK);
                                /*
                                 * If ce is zero, then we're processing
                                 * a special character through ttyoutput.
                                /*
                                 * If ce is zero, then we're processing
                                 * a special character through ttyoutput.
@@ -1371,17 +1321,14 @@ loop:
                                        if (ttyoutput(*cp, tp) >= 0) {
                                            /* no c-lists, wait a bit */
                                            ttstart(tp);
                                        if (ttyoutput(*cp, tp) >= 0) {
                                            /* no c-lists, wait a bit */
                                            ttstart(tp);
-                                           sleep((caddr_t)&lbolt, TTOPRI);
-                                           if (cc != 0) {
-                                               uio->uio_iov->iov_base -= cc;
-                                               uio->uio_iov->iov_len += cc;
-                                               uio->uio_resid += cc;
-                                               uio->uio_offset -= cc;
-                                           }
+                                           if (error = ttysleep(tp, 
+                                               (caddr_t)&lbolt,
+                                                TTOPRI | PCATCH, ttybuf, 0))
+                                                   break;
                                            goto loop;
                                        }
                                        cp++, cc--;
                                            goto loop;
                                        }
                                        cp++, cc--;
-                                       if (tp->t_flags&FLUSHO ||
+                                       if (tp->t_lflag&FLUSHO ||
                                            tp->t_outq.c_cc > hiwat)
                                                goto ovhiwat;
                                        continue;
                                            tp->t_outq.c_cc > hiwat)
                                                goto ovhiwat;
                                        continue;
@@ -1400,49 +1347,54 @@ loop:
                        ce -= i;
                        tp->t_col += ce;
                        cp += ce, cc -= ce, tk_nout += ce;
                        ce -= i;
                        tp->t_col += ce;
                        cp += ce, cc -= ce, tk_nout += ce;
+                       tp->t_outcc += ce;
                        if (i > 0) {
                                /* out of c-lists, wait a bit */
                                ttstart(tp);
                        if (i > 0) {
                                /* out of c-lists, wait a bit */
                                ttstart(tp);
-                               sleep((caddr_t)&lbolt, TTOPRI);
-                               uio->uio_iov->iov_base -= cc;
-                               uio->uio_iov->iov_len += cc;
-                               uio->uio_resid += cc;
-                               uio->uio_offset -= cc;
+                               if (error = ttysleep(tp, (caddr_t)&lbolt,
+                                           TTOPRI | PCATCH, ttybuf, 0))
+                                       break;
                                goto loop;
                        }
                                goto loop;
                        }
-                       if (tp->t_flags&FLUSHO || tp->t_outq.c_cc > hiwat)
-                               goto ovhiwat;
+                       if (tp->t_lflag&FLUSHO || tp->t_outq.c_cc > hiwat)
+                               break;
                }
                }
+               ttstart(tp);
+               ttstart(tp);
        }
        }
-       ttstart(tp);
+out:
+       /*
+        * If cc is nonzero, we leave the uio structure inconsistent,
+        * as the offset and iov pointers have moved forward,
+        * but it doesn't matter (the call will either return short
+        * or restart with a new uio).
+        */
+       uio->uio_resid += cc;
        return (error);
 
 ovhiwat:
        return (error);
 
 ovhiwat:
+       ttstart(tp);
        s = spltty();
        s = spltty();
-       if (cc != 0) {
-               uio->uio_iov->iov_base -= cc;
-               uio->uio_iov->iov_len += cc;
-               uio->uio_resid += cc;
-               uio->uio_offset -= cc;
-       }
        /*
        /*
-        * This can only occur if FLUSHO
-        * is also set in t_flags.
+        * This can only occur if FLUSHO is set in t_lflag,
+        * or if ttstart/oproc is synchronous (or very fast).
         */
        if (tp->t_outq.c_cc <= hiwat) {
                splx(s);
                goto loop;
        }
         */
        if (tp->t_outq.c_cc <= hiwat) {
                splx(s);
                goto loop;
        }
-       ttstart(tp);
-       if (tp->t_state&TS_NBIO) {
+       if (flag & IO_NDELAY) {
                splx(s);
                splx(s);
+               uio->uio_resid += cc;
                if (uio->uio_resid == cnt)
                        return (EWOULDBLOCK);
                return (0);
        }
        tp->t_state |= TS_ASLEEP;
                if (uio->uio_resid == cnt)
                        return (EWOULDBLOCK);
                return (0);
        }
        tp->t_state |= TS_ASLEEP;
-       sleep((caddr_t)&tp->t_outq, TTOPRI);
+       error = ttysleep(tp, (caddr_t)&tp->t_outq, TTOPRI | PCATCH, ttyout, 0);
        splx(s);
        splx(s);
+       if (error)
+               goto out;
        goto loop;
 }
 
        goto loop;
 }
 
@@ -1459,11 +1411,9 @@ ttyrub(c, tp)
        int s;
        char *nextc();
 
        int s;
        char *nextc();
 
-       if ((tp->t_flags&ECHO) == 0)
+       if ((tp->t_lflag&ECHO) == 0)
                return;
                return;
-       tp->t_flags &= ~FLUSHO;
-       c &= 0377;
-       if (tp->t_flags&CRTBS) {
+       if (tp->t_lflag&ECHOE) {
                if (tp->t_rocount == 0) {
                        /*
                         * Screwed by ttwrite; retype
                if (tp->t_rocount == 0) {
                        /*
                         * Screwed by ttwrite; retype
@@ -1471,26 +1421,28 @@ ttyrub(c, tp)
                        ttyretype(tp);
                        return;
                }
                        ttyretype(tp);
                        return;
                }
-               if (c == ('\t'|0200) || c == ('\n'|0200))
+               /* if tab or newline was escaped  - XXX - not 8bit */
+               if (c == ('\t'|TTY_QUOTE) || c == ('\n'|TTY_QUOTE))
                        ttyrubo(tp, 2);
                        ttyrubo(tp, 2);
-               else switch (partab[c&=0177]&0177) {
+               else switch (CCLASS(c &= TTY_CHARMASK)) {
 
                case ORDINARY:
 
                case ORDINARY:
-                       if (tp->t_flags&LCASE && c >= 'A' && c <= 'Z')
-                               ttyrubo(tp, 2);
-                       else
-                               ttyrubo(tp, 1);
+#ifdef notdef
+                       ttyrubo(tp, 1);
                        break;
 
                case VTAB:
                case BACKSPACE:
                case CONTROL:
                case RETURN:
                        break;
 
                case VTAB:
                case BACKSPACE:
                case CONTROL:
                case RETURN:
-                       if (tp->t_flags&CTLECH)
+               case NEWLINE:
+                       if (tp->t_lflag&ECHOCTL)
                                ttyrubo(tp, 2);
                        break;
 
                                ttyrubo(tp, 2);
                        break;
 
-               case TAB:
+               case TAB: {
+                       int c;
+
                        if (tp->t_rocount < tp->t_rawq.c_cc) {
                                ttyretype(tp);
                                return;
                        if (tp->t_rocount < tp->t_rawq.c_cc) {
                                ttyretype(tp);
                                return;
@@ -1498,12 +1450,10 @@ ttyrub(c, tp)
                        s = spltty();
                        savecol = tp->t_col;
                        tp->t_state |= TS_CNTTB;
                        s = spltty();
                        savecol = tp->t_col;
                        tp->t_state |= TS_CNTTB;
-                       tp->t_flags |= FLUSHO;
+                       tp->t_lflag |= FLUSHO;
                        tp->t_col = tp->t_rocol;
                        cp = tp->t_rawq.c_cf;
                        tp->t_col = tp->t_rocol;
                        cp = tp->t_rawq.c_cf;
-                       for (; cp; cp = nextc(&tp->t_rawq, cp))
-                               ttyecho(*cp, tp);
-                       tp->t_flags &= ~FLUSHO;
+                       tp->t_lflag &= ~FLUSHO;
                        tp->t_state &= ~TS_CNTTB;
                        splx(s);
                        /*
                        tp->t_state &= ~TS_CNTTB;
                        splx(s);
                        /*
@@ -1516,18 +1466,22 @@ ttyrub(c, tp)
                        while (--savecol >= 0)
                                (void) ttyoutput('\b', tp);
                        break;
                        while (--savecol >= 0)
                                (void) ttyoutput('\b', tp);
                        break;
+               }
 
                default:
 
                default:
-                       panic("ttyrub");
+                       /* XXX */
+                       printf("ttyrub: would panic c = %d, val = %d\n",
+                               c, CCLASS(c));
+                       /*panic("ttyrub");*/
                }
                }
-       } else if (tp->t_flags&PRTERA) {
+       } else if (tp->t_lflag&ECHOPRT) {
                if ((tp->t_state&TS_ERASE) == 0) {
                        (void) ttyoutput('\\', tp);
                        tp->t_state |= TS_ERASE;
                }
                ttyecho(c, tp);
        } else
                if ((tp->t_state&TS_ERASE) == 0) {
                        (void) ttyoutput('\\', tp);
                        tp->t_state |= TS_ERASE;
                }
                ttyecho(c, tp);
        } else
-               ttyecho(tp->t_erase, tp);
+               ttyecho(tp->t_cc[VERASE], tp);
        tp->t_rocount--;
 }
 
        tp->t_rocount--;
 }
 
@@ -1539,10 +1493,10 @@ ttyrubo(tp, cnt)
        register struct tty *tp;
        int cnt;
 {
        register struct tty *tp;
        int cnt;
 {
-       register char *rubostring = tp->t_flags&CRTERA ? "\b \b" : "\b";
+       register char *rubostring = tp->t_lflag&ECHOE ? "\b \b" : "\b";
 
        while (--cnt >= 0)
 
        while (--cnt >= 0)
-               ttyout(rubostring, tp);
+               ttyoutstr("\b \b", tp);
 }
 
 /*
 }
 
 /*
@@ -1554,16 +1508,20 @@ ttyretype(tp)
 {
        register char *cp;
        char *nextc();
 {
        register char *cp;
        char *nextc();
-       int s;
+       int s, c;
 
 
-       if (tp->t_rprntc != 0377)
-               ttyecho(tp->t_rprntc, tp);
+       if (tp->t_cc[VREPRINT] != POSIX_V_DISABLE)
+               ttyecho(tp->t_cc[VREPRINT], tp);
        (void) ttyoutput('\n', tp);
        s = spltty();
        (void) ttyoutput('\n', tp);
        s = spltty();
-       for (cp = tp->t_canq.c_cf; cp; cp = nextc(&tp->t_canq, cp))
-               ttyecho(*cp, tp);
-       for (cp = tp->t_rawq.c_cf; cp; cp = nextc(&tp->t_rawq, cp))
-               ttyecho(*cp, tp);
+       /*** XXX *** FIX *** NEXTC IS BROKEN - DOESN'T CHECK QUOTE
+         BIT OF FIRST CHAR ****/
+       for (cp = tp->t_canq.c_cf, c=(cp?*cp:0); cp; cp = nextc(&tp->t_canq, cp, &c)) {
+               ttyecho(c, tp);
+       }
+       for (cp = tp->t_rawq.c_cf, c=(cp?*cp:0); cp; cp = nextc(&tp->t_rawq, cp, &c)) {
+               ttyecho(c, tp);
+       }
        tp->t_state &= ~TS_ERASE;
        splx(s);
        tp->t_rocount = tp->t_rawq.c_cc;
        tp->t_state &= ~TS_ERASE;
        splx(s);
        tp->t_rocount = tp->t_rawq.c_cc;
@@ -1571,54 +1529,34 @@ ttyretype(tp)
 }
 
 /*
 }
 
 /*
- * Echo a typed character to the terminal
+ * Echo a typed character to the terminal.
  */
 ttyecho(c, tp)
        register c;
        register struct tty *tp;
 {
  */
 ttyecho(c, tp)
        register c;
        register struct tty *tp;
 {
-
-       if ((tp->t_state&TS_CNTTB) == 0)
-               tp->t_flags &= ~FLUSHO;
-       if ((tp->t_flags&ECHO) == 0)
-               return;
        c &= 0377;
        c &= 0377;
-       if (tp->t_flags&RAW) {
-               (void) ttyoutput(c, tp);
+       if ((tp->t_state&TS_CNTTB) == 0)
+               tp->t_lflag &= ~FLUSHO;
+       if ((tp->t_lflag&ECHO) == 0 && !(tp->t_lflag&ECHONL && c == '\n'))
                return;
                return;
-       }
-       if (c == '\r' && tp->t_flags&CRMOD)
-               c = '\n';
-       if (tp->t_flags&CTLECH) {
-               if ((c&0177) <= 037 && c!='\t' && c!='\n' || (c&0177)==0177) {
+       if (tp->t_lflag&ECHOCTL) {
+               if ((c&TTY_CHARMASK) <= 037 && c != '\t' && c != '\n' ||
+                   c == 0177) {
                        (void) ttyoutput('^', tp);
                        (void) ttyoutput('^', tp);
-                       c &= 0177;
+                       c &= TTY_CHARMASK;
                        if (c == 0177)
                                c = '?';
                        if (c == 0177)
                                c = '?';
-                       else if (tp->t_flags&LCASE)
-                               c += 'a' - 1;
+#ifdef notdef
+#endif
                        else
                                c += 'A' - 1;
                }
        }
                        else
                                c += 'A' - 1;
                }
        }
-       (void) ttyoutput(c&0177, tp);
-}
-
-/*
- * Is c a break char for tp?
- */
-ttbreakc(c, tp)
-       register c;
-       register struct tty *tp;
-{
-       return (c == '\n' || c == tp->t_eofc || c == tp->t_brkc ||
-               c == '\r' && (tp->t_flags&CRMOD));
-}
-
-/*
+       (void) ttyoutput(c, tp);
  * send string cp to tp
  */
  * send string cp to tp
  */
-ttyout(cp, tp)
+ttyoutstr(cp, tp)
        register char *cp;
        register struct tty *tp;
 {
        register char *cp;
        register struct tty *tp;
 {
@@ -1628,8 +1566,11 @@ ttyout(cp, tp)
                (void) ttyoutput(c, tp);
 }
 
                (void) ttyoutput(c, tp);
 }
 
+/*
+ * Wake up any readers on a tty.
+ */
 ttwakeup(tp)
 ttwakeup(tp)
-       struct tty *tp;
+       register struct tty *tp;
 {
 
        if (tp->t_rsel) {
 {
 
        if (tp->t_rsel) {
@@ -1638,6 +1579,222 @@ ttwakeup(tp)
                tp->t_rsel = 0;
        }
        if (tp->t_state & TS_ASYNC)
                tp->t_rsel = 0;
        }
        if (tp->t_state & TS_ASYNC)
-               gsignal(tp->t_pgrp, SIGIO); 
+               pgsignal(tp->t_pgrp, SIGIO, 1); 
        wakeup((caddr_t)&tp->t_rawq);
 }
        wakeup((caddr_t)&tp->t_rawq);
 }
+
+/*
+ * Look up a code for a specified speed in a conversion table;
+ * used by drivers to map software speed values to hardware parameters.
+ */
+ttspeedtab(speed, table)
+       register struct speedtab *table;
+{
+
+       for ( ; table->sp_speed != -1; table++)
+               if (table->sp_speed == speed)
+                       return (table->sp_code);
+       return (-1);
+}
+
+/*
+ * set tty hi and low water marks
+ *
+ * Try to arrange the dynamics so there's about one second
+ * from hi to low water.
+ * 
+ */
+ttsetwater(tp)
+       struct tty *tp;
+{
+       register cps = tp->t_ospeed / 10;
+       register x;
+
+#define clamp(x, h, l) ((x)>h ? h : ((x)<l) ? l : (x))
+       tp->t_lowat = x = clamp(cps/2, TTMAXLOWAT, TTMINLOWAT);
+       x += cps;
+       x = clamp(x, TTMAXHIWAT, TTMINHIWAT);
+       tp->t_hiwat = roundup(x, CBSIZE);
+#undef clamp
+}
+
+/*
+ * Report on state of foreground process group.
+ */
+ttyinfo(tp)
+       register struct tty *tp;
+{
+       register struct proc *p, *pick;
+       struct timeval utime, stime;
+       int tmp;
+
+       if (ttycheckoutq(tp,0) == 0) 
+               return;
+
+       /* Print load average. */
+       tmp = (averunnable[0] * 100 + FSCALE / 2) >> FSHIFT;
+       ttyprintf(tp, "load: %d.%02d ", tmp / 100, tmp % 100);
+
+       if (tp->t_session == NULL)
+               ttyprintf(tp, "not a controlling terminal\n");
+       else if (tp->t_pgrp == NULL)
+               ttyprintf(tp, "no foreground process group\n");
+       else if ((p = tp->t_pgrp->pg_mem) == NULL)
+               ttyprintf(tp, "empty foreground process group\n");
+       else {
+               /* Pick interesting process. */
+               for (pick = NULL; p != NULL; p = p->p_pgrpnxt)
+                       if (proc_compare(pick, p))
+                               pick = p;
+
+               ttyprintf(tp, " cmd: %s %d [%s] ", pick->p_comm, pick->p_pid,
+                   pick->p_stat == SRUN ? "running" :
+                   pick->p_wmesg ? pick->p_wmesg : "iowait");
+
+               /*
+                * Lock out clock if process is running; get user/system
+                * cpu time.
+                */
+               if (curproc == pick)
+                       tmp = splclock();
+               utime = pick->p_utime;
+               stime = pick->p_stime;
+               if (curproc == pick)
+                       splx(tmp);
+
+               /* Print user time. */
+               ttyprintf(tp, "%d.%02du ",
+                   utime.tv_sec, (utime.tv_usec + 5000) / 10000);
+
+               /* Print system time. */
+               ttyprintf(tp, "%d.%02ds ",
+                   stime.tv_sec, (stime.tv_usec + 5000) / 10000);
+
+#define        pgtok(a)        (((a) * NBPG) / 1024)
+               /* Print percentage cpu, resident set size. */
+               tmp = pick->p_pctcpu * 10000 + FSCALE / 2 >> FSHIFT;
+               ttyprintf(tp, "%d%% %dk\n",
+                  tmp / 100, pgtok(pick->p_vmspace->vm_rssize));
+       }
+       tp->t_rocount = 0;      /* so pending input will be retyped if BS */
+}
+
+/*
+ * Returns 1 if p2 is "better" than p1
+ *
+ * The algorithm for picking the "interesting" process is thus:
+ *
+ *     1) (Only foreground processes are eligable - implied)
+ *     2) Runnable processes are favored over anything
+ *        else.  The runner with the highest cpu
+ *        utilization is picked (p_cpu).  Ties are
+ *        broken by picking the highest pid.
+ *     3  Next, the sleeper with the shortest sleep
+ *        time is favored.  With ties, we pick out
+ *        just "short-term" sleepers (SSINTR == 0).
+ *        Further ties are broken by picking the highest
+ *        pid.
+ *
+ */
+#define isrun(p)       (((p)->p_stat == SRUN) || ((p)->p_stat == SIDL))
+#define TESTAB(a, b)    ((a)<<1 | (b))
+#define ONLYA   2
+#define ONLYB   1
+#define BOTH    3
+
+static int
+proc_compare(p1, p2)
+       register struct proc *p1, *p2;
+{
+
+       if (p1 == NULL)
+               return (1);
+       /*
+        * see if at least one of them is runnable
+        */
+       switch (TESTAB(isrun(p1), isrun(p2))) {
+       case ONLYA:
+               return (0);
+       case ONLYB:
+               return (1);
+       case BOTH:
+               /*
+                * tie - favor one with highest recent cpu utilization
+                */
+               if (p2->p_cpu > p1->p_cpu)
+                       return (1);
+               if (p1->p_cpu > p2->p_cpu)
+                       return (0);
+               return (p2->p_pid > p1->p_pid); /* tie - return highest pid */
+       }
+       /*
+        * weed out zombies
+        */
+       switch (TESTAB(p1->p_stat == SZOMB, p2->p_stat == SZOMB)) {
+       case ONLYA:
+               return (1);
+       case ONLYB:
+               return (0);
+       case BOTH:
+               return (p2->p_pid > p1->p_pid); /* tie - return highest pid */
+       }
+       /* 
+        * pick the one with the smallest sleep time
+        */
+       if (p2->p_slptime > p1->p_slptime)
+               return (0);
+       if (p1->p_slptime > p2->p_slptime)
+               return (1);
+       /*
+        * favor one sleeping in a non-interruptible sleep
+        */
+       if (p1->p_flag&SSINTR && (p2->p_flag&SSINTR) == 0)
+               return (1);
+       if (p2->p_flag&SSINTR && (p1->p_flag&SSINTR) == 0)
+               return (0);
+       return (p2->p_pid > p1->p_pid);         /* tie - return highest pid */
+}
+
+/*
+ * Output char to tty; console putchar style.
+ */
+tputchar(c, tp)
+       int c;
+       struct tty *tp;
+{
+       register s = spltty();
+
+       if ((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);
+               splx(s);
+               return (0);
+       }
+       splx(s);
+       return (-1);
+}
+
+/*
+ * Sleep on chan, returning ERESTART if tty changed
+ * while we napped and returning any errors (e.g. EINTR/ETIMEDOUT)
+ * reported by tsleep.  If the tty is revoked, restarting a pending
+ * call will redo validation done at the start of the call.
+ */
+ttysleep(tp, chan, pri, wmesg, timo)
+       struct tty *tp;
+       caddr_t chan;
+       int pri;
+       char *wmesg;
+       int timo;
+{
+       int error;
+       short gen = tp->t_gen;
+
+       if (error = tsleep(chan, pri, wmesg, timo))
+               return (error);
+       if (tp->t_gen != gen)
+               return (ERESTART);
+       return (0);
+}