BSD 4_3_Net_2 release

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

diff --git a/usr/src/sys/kern/tty_pty.c b/usr/src/sys/kern/tty_pty.c
index 84d9db6..eb9bf5f 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -1,9 +1,36 @@
 /*
 /*

- * 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, 1989 The Regents of the University of California.
+ * All rights reserved.

  *
  *

- *     @(#)tty_pty.c   6.17 (Berkeley) %G%
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)tty_pty.c   7.21 (Berkeley) 5/30/91

  */
 
 /*
  */
 
 /*


@@ -17,13 +44,12 @@
 #include "systm.h"
 #include "ioctl.h"
 #include "tty.h"
 #include "systm.h"
 #include "ioctl.h"
 #include "tty.h"

-#include "dir.h"
-#include "user.h"

 #include "conf.h"
 #include "file.h"
 #include "proc.h"
 #include "uio.h"
 #include "kernel.h"
 #include "conf.h"
 #include "file.h"
 #include "proc.h"
 #include "uio.h"
 #include "kernel.h"

+#include "vnode.h"

 
 #if NPTY == 1
 #undef NPTY
 
 #if NPTY == 1
 #undef NPTY


@@ -39,7 +65,6 @@
 struct tty pt_tty[NPTY];
 struct pt_ioctl {
        int     pt_flags;
 struct tty pt_tty[NPTY];
 struct pt_ioctl {
        int     pt_flags;

-       int     pt_gensym;

        struct  proc *pt_selr, *pt_selw;
        u_char  pt_send;
        u_char  pt_ucntl;
        struct  proc *pt_selr, *pt_selw;
        u_char  pt_send;
        u_char  pt_ucntl;


@@ -48,7 +73,6 @@ int   npty = NPTY;            /* for pstat -t */
 
 #define        PF_RCOLL        0x01
 #define        PF_WCOLL        0x02
 
 #define        PF_RCOLL        0x01
 #define        PF_WCOLL        0x02

-#define        PF_NBIO         0x04

 #define        PF_PKT          0x08            /* packet mode */
 #define        PF_STOPPED      0x10            /* user told stopped */
 #define        PF_REMOTE       0x20            /* remote and flow controlled input */
 #define        PF_PKT          0x08            /* packet mode */
 #define        PF_STOPPED      0x10            /* user told stopped */
 #define        PF_REMOTE       0x20            /* remote and flow controlled input */


@@ -56,8 +80,9 @@ int   npty = NPTY;            /* for pstat -t */
 #define PF_UCNTL       0x80            /* user control mode */
 
 /*ARGSUSED*/
 #define PF_UCNTL       0x80            /* user control mode */
 
 /*ARGSUSED*/

-ptsopen(dev, flag)
+ptsopen(dev, flag, devtype, p)

        dev_t dev;
        dev_t dev;

+       struct proc *p;

 {
        register struct tty *tp;
        int error;
 {
        register struct tty *tp;
        int error;


@@ -69,55 +94,72 @@ ptsopen(dev, flag)
                return (ENXIO);
        tp = &pt_tty[minor(dev)];
        if ((tp->t_state & TS_ISOPEN) == 0) {
                return (ENXIO);
        tp = &pt_tty[minor(dev)];
        if ((tp->t_state & TS_ISOPEN) == 0) {

+               tp->t_state |= TS_WOPEN;

                ttychars(tp);           /* Set up default chars */
                ttychars(tp);           /* Set up default chars */

-               tp->t_ispeed = tp->t_ospeed = EXTB;
-               tp->t_flags = 0;        /* No features (nor raw mode) */
-       } else if (tp->t_state&TS_XCLUDE && u.u_uid != 0)
+               tp->t_iflag = TTYDEF_IFLAG;
+               tp->t_oflag = TTYDEF_OFLAG;
+               tp->t_lflag = TTYDEF_LFLAG;
+               tp->t_cflag = TTYDEF_CFLAG;
+               tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
+               ttsetwater(tp);         /* would be done in xxparam() */
+       } else if (tp->t_state&TS_XCLUDE && p->p_ucred->cr_uid != 0)

                return (EBUSY);
        if (tp->t_oproc)                        /* Ctrlr still around. */
                tp->t_state |= TS_CARR_ON;
        while ((tp->t_state & TS_CARR_ON) == 0) {
                tp->t_state |= TS_WOPEN;
                return (EBUSY);
        if (tp->t_oproc)                        /* Ctrlr still around. */
                tp->t_state |= TS_CARR_ON;
        while ((tp->t_state & TS_CARR_ON) == 0) {
                tp->t_state |= TS_WOPEN;

-               sleep((caddr_t)&tp->t_rawq, TTIPRI);
+               if (flag&FNONBLOCK)
+                       break;
+               if (error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
+                   ttopen, 0))
+                       return (error);

        }
        }

-       error = (*linesw[tp->t_line].l_open)(dev, tp);
+       error = (*linesw[tp->t_line].l_open)(dev, tp, flag);

        ptcwakeup(tp, FREAD|FWRITE);
        return (error);
 }
 
        ptcwakeup(tp, FREAD|FWRITE);
        return (error);
 }
 

-ptsclose(dev)
+ptsclose(dev, flag, mode, p)

        dev_t dev;
        dev_t dev;

+       int flag, mode;
+       struct proc *p;

 {
        register struct tty *tp;
 
        tp = &pt_tty[minor(dev)];
 {
        register struct tty *tp;
 
        tp = &pt_tty[minor(dev)];

-       (*linesw[tp->t_line].l_close)(tp);
+       (*linesw[tp->t_line].l_close)(tp, flag);

        ttyclose(tp);
        ptcwakeup(tp, FREAD|FWRITE);
 }
 
        ttyclose(tp);
        ptcwakeup(tp, FREAD|FWRITE);
 }
 

-ptsread(dev, uio)
+ptsread(dev, uio, flag)

        dev_t dev;
        struct uio *uio;
 {
        dev_t dev;
        struct uio *uio;
 {

+       struct proc *p = curproc;

        register struct tty *tp = &pt_tty[minor(dev)];
        register struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        int error = 0;
 
 again:
        if (pti->pt_flags & PF_REMOTE) {
        register struct tty *tp = &pt_tty[minor(dev)];
        register struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        int error = 0;
 
 again:
        if (pti->pt_flags & PF_REMOTE) {

-               while (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)
+               while (isbackground(p, tp)) {
+                       if ((p->p_sigignore & sigmask(SIGTTIN)) ||
+                           (p->p_sigmask & sigmask(SIGTTIN)) ||
+                           p->p_pgrp->pg_jobc == 0 ||
+                           p->p_flag&SPPWAIT)

                                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);

                }
                if (tp->t_canq.c_cc == 0) {
                }
                if (tp->t_canq.c_cc == 0) {

-                       if (tp->t_state & TS_NBIO)
+                       if (flag & IO_NDELAY)

                                return (EWOULDBLOCK);
                                return (EWOULDBLOCK);

-                       sleep((caddr_t)&tp->t_canq, TTIPRI);
+                       if (error = ttysleep(tp, (caddr_t)&tp->t_canq,
+                           TTIPRI | PCATCH, ttyin, 0))
+                               return (error);

                        goto again;
                }
                while (tp->t_canq.c_cc > 1 && uio->uio_resid > 0)
                        goto again;
                }
                while (tp->t_canq.c_cc > 1 && uio->uio_resid > 0)


@@ -131,7 +173,7 @@ again:
                        return (error);
        } else
                if (tp->t_oproc)
                        return (error);
        } else
                if (tp->t_oproc)

-                       error = (*linesw[tp->t_line].l_read)(tp, uio);
+                       error = (*linesw[tp->t_line].l_read)(tp, uio, flag);

        ptcwakeup(tp, FWRITE);
        return (error);
 }
        ptcwakeup(tp, FWRITE);
        return (error);
 }


@@ -141,7 +183,7 @@ again:
  * Wakeups of controlling tty will happen
  * indirectly, when tty driver calls ptsstart.
  */
  * Wakeups of controlling tty will happen
  * indirectly, when tty driver calls ptsstart.
  */

-ptswrite(dev, uio)
+ptswrite(dev, uio, flag)

        dev_t dev;
        struct uio *uio;
 {
        dev_t dev;
        struct uio *uio;
 {


@@ -150,7 +192,7 @@ ptswrite(dev, uio)
        tp = &pt_tty[minor(dev)];
        if (tp->t_oproc == 0)
                return (EIO);
        tp = &pt_tty[minor(dev)];
        if (tp->t_oproc == 0)
                return (EIO);

-       return ((*linesw[tp->t_line].l_write)(tp, uio));
+       return ((*linesw[tp->t_line].l_write)(tp, uio, flag));

 }
 
 /*
 }
 
 /*


@@ -195,9 +237,14 @@ ptcwakeup(tp, flag)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-ptcopen(dev, flag)
+#ifdef __STDC__
+ptcopen(dev_t dev, int flag, int devtype, struct proc *p)
+#else
+ptcopen(dev, flag, devtype, p)

        dev_t dev;
        dev_t dev;

-       int flag;
+       int flag, devtype;
+       struct proc *p;
+#endif

 {
        register struct tty *tp;
        struct pt_ioctl *pti;
 {
        register struct tty *tp;
        struct pt_ioctl *pti;


@@ -209,7 +256,7 @@ ptcopen(dev, flag)
                return (EIO);
        tp->t_oproc = ptsstart;
        (void)(*linesw[tp->t_line].l_modem)(tp, 1);
                return (EIO);
        tp->t_oproc = ptsstart;
        (void)(*linesw[tp->t_line].l_modem)(tp, 1);

-       tp->t_state |= TS_CARR_ON;
+       tp->t_lflag &= ~EXTPROC;

        pti = &pt_ioctl[minor(dev)];
        pti->pt_flags = 0;
        pti->pt_send = 0;
        pti = &pt_ioctl[minor(dev)];
        pti->pt_flags = 0;
        pti->pt_send = 0;


@@ -224,10 +271,12 @@ ptcclose(dev)
 
        tp = &pt_tty[minor(dev)];
        (void)(*linesw[tp->t_line].l_modem)(tp, 0);
 
        tp = &pt_tty[minor(dev)];
        (void)(*linesw[tp->t_line].l_modem)(tp, 0);

+       tp->t_state &= ~TS_CARR_ON;

        tp->t_oproc = 0;                /* mark closed */
        tp->t_oproc = 0;                /* mark closed */

+       tp->t_session = 0;

 }
 
 }
 

-ptcread(dev, uio)
+ptcread(dev, uio, flag)

        dev_t dev;
        struct uio *uio;
 {
        dev_t dev;
        struct uio *uio;
 {


@@ -245,14 +294,19 @@ ptcread(dev, uio)
        for (;;) {
                if (tp->t_state&TS_ISOPEN) {
                        if (pti->pt_flags&PF_PKT && pti->pt_send) {
        for (;;) {
                if (tp->t_state&TS_ISOPEN) {
                        if (pti->pt_flags&PF_PKT && pti->pt_send) {

-                               error = ureadc(pti->pt_send, uio);
+                               error = ureadc((int)pti->pt_send, uio);

                                if (error)
                                        return (error);
                                if (error)
                                        return (error);

+                               if (pti->pt_send & TIOCPKT_IOCTL) {
+                                       cc = MIN(uio->uio_resid,
+                                               sizeof(tp->t_termios));
+                                       uiomove(&tp->t_termios, cc, uio);
+                               }

                                pti->pt_send = 0;
                                return (0);
                        }
                        if (pti->pt_flags&PF_UCNTL && pti->pt_ucntl) {
                                pti->pt_send = 0;
                                return (0);
                        }
                        if (pti->pt_flags&PF_UCNTL && pti->pt_ucntl) {

-                               error = ureadc(pti->pt_ucntl, uio);
+                               error = ureadc((int)pti->pt_ucntl, uio);

                                if (error)
                                        return (error);
                                pti->pt_ucntl = 0;
                                if (error)
                                        return (error);
                                pti->pt_ucntl = 0;


@@ -262,10 +316,12 @@ ptcread(dev, uio)
                                break;
                }
                if ((tp->t_state&TS_CARR_ON) == 0)
                                break;
                }
                if ((tp->t_state&TS_CARR_ON) == 0)

-                       return (EIO);
-               if (pti->pt_flags&PF_NBIO)
+                       return (0);     /* EOF */
+               if (flag & IO_NDELAY)

                        return (EWOULDBLOCK);
                        return (EWOULDBLOCK);

-               sleep((caddr_t)&tp->t_outq.c_cf, TTIPRI);
+               if (error = tsleep((caddr_t)&tp->t_outq.c_cf, TTIPRI | PCATCH,
+                   ttyin, 0))
+                       return (error);

        }
        if (pti->pt_flags & (PF_PKT|PF_UCNTL))
                error = ureadc(0, uio);
        }
        if (pti->pt_flags & (PF_PKT|PF_UCNTL))
                error = ureadc(0, uio);


@@ -273,9 +329,9 @@ ptcread(dev, uio)
                cc = q_to_b(&tp->t_outq, buf, MIN(uio->uio_resid, BUFSIZ));
                if (cc <= 0)
                        break;
                cc = q_to_b(&tp->t_outq, buf, MIN(uio->uio_resid, BUFSIZ));
                if (cc <= 0)
                        break;

-               error = uiomove(buf, cc, UIO_READ, uio);
+               error = uiomove(buf, cc, uio);

        }
        }

-       if (tp->t_outq.c_cc <= TTLOWAT(tp)) {
+       if (tp->t_outq.c_cc <= tp->t_lowat) {

                if (tp->t_state&TS_ASLEEP) {
                        tp->t_state &= ~TS_ASLEEP;
                        wakeup((caddr_t)&tp->t_outq);
                if (tp->t_state&TS_ASLEEP) {
                        tp->t_state &= ~TS_ASLEEP;
                        wakeup((caddr_t)&tp->t_outq);


@@ -312,68 +368,75 @@ ptsstop(tp, flush)
        ptcwakeup(tp, flag);
 }
 
        ptcwakeup(tp, flag);
 }
 

-ptcselect(dev, rw)
+ptcselect(dev, rw, p)

        dev_t dev;
        int rw;
        dev_t dev;
        int rw;

+       struct proc *p;

 {
        register struct tty *tp = &pt_tty[minor(dev)];
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
 {
        register struct tty *tp = &pt_tty[minor(dev)];
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];

-       struct proc *p;
+       struct proc *prev;

        int s;
 
        if ((tp->t_state&TS_CARR_ON) == 0)
                return (1);
        int s;
 
        if ((tp->t_state&TS_CARR_ON) == 0)
                return (1);

-       s = spl5();

        switch (rw) {
 
        case FREAD:
        switch (rw) {
 
        case FREAD:

+               /*
+                * Need to block timeouts (ttrstart).
+                */
+               s = spltty();

                if ((tp->t_state&TS_ISOPEN) &&
                     tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0) {
                        splx(s);
                        return (1);
                }
                if ((tp->t_state&TS_ISOPEN) &&
                     tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0) {
                        splx(s);
                        return (1);
                }

+               splx(s);

                /* FALLTHROUGH */
 
        case 0:                                 /* exceptional */
                if ((tp->t_state&TS_ISOPEN) &&
                    (pti->pt_flags&PF_PKT && pti->pt_send ||
                /* FALLTHROUGH */
 
        case 0:                                 /* exceptional */
                if ((tp->t_state&TS_ISOPEN) &&
                    (pti->pt_flags&PF_PKT && pti->pt_send ||

-                    pti->pt_flags&PF_UCNTL && pti->pt_ucntl)) {
-                       splx(s);
+                    pti->pt_flags&PF_UCNTL && pti->pt_ucntl))

                        return (1);
                        return (1);

-               }
-               if ((p = pti->pt_selr) && p->p_wchan == (caddr_t)&selwait)
+               if ((prev = pti->pt_selr) && prev->p_wchan == (caddr_t)&selwait)

                        pti->pt_flags |= PF_RCOLL;
                else
                        pti->pt_flags |= PF_RCOLL;
                else

-                       pti->pt_selr = u.u_procp;
+                       pti->pt_selr = p;

                break;
 
 
        case FWRITE:
                break;
 
 
        case FWRITE:

-               if ((tp->t_state&TS_ISOPEN) &&
-                   ((pti->pt_flags&PF_REMOTE) == 0 || tp->t_canq.c_cc == 0)) {
-                       splx(s);
-                       return (1);
+               if (tp->t_state&TS_ISOPEN) {
+                       if (pti->pt_flags & PF_REMOTE) {
+                           if (tp->t_canq.c_cc == 0)
+                               return (1);
+                       } else {
+                           if (tp->t_rawq.c_cc + tp->t_canq.c_cc < TTYHOG-2)
+                                   return (1);
+                           if (tp->t_canq.c_cc == 0 && (tp->t_iflag&ICANON))
+                                   return (1);
+                       }

                }
                }

-               if ((p = pti->pt_selw) && p->p_wchan == (caddr_t)&selwait)
+               if ((prev = pti->pt_selw) && prev->p_wchan == (caddr_t)&selwait)

                        pti->pt_flags |= PF_WCOLL;
                else
                        pti->pt_flags |= PF_WCOLL;
                else

-                       pti->pt_selw = u.u_procp;
+                       pti->pt_selw = p;

                break;
 
        }
                break;
 
        }

-       splx(s);

        return (0);
 }
 
        return (0);
 }
 

-ptcwrite(dev, uio)
+ptcwrite(dev, uio, flag)

        dev_t dev;
        register struct uio *uio;
 {
        register struct tty *tp = &pt_tty[minor(dev)];
        dev_t dev;
        register struct uio *uio;
 {
        register struct tty *tp = &pt_tty[minor(dev)];

-       register struct iovec *iov;
-       register char *cp;
+       register u_char *cp;

        register int cc = 0;
        register int cc = 0;

-       char locbuf[BUFSIZ];
+       u_char locbuf[BUFSIZ];

        int cnt = 0;
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        int error = 0;
        int cnt = 0;
        struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
        int error = 0;


@@ -384,18 +447,12 @@ again:
        if (pti->pt_flags & PF_REMOTE) {
                if (tp->t_canq.c_cc)
                        goto block;
        if (pti->pt_flags & PF_REMOTE) {
                if (tp->t_canq.c_cc)
                        goto block;

-               while (uio->uio_iovcnt > 0 && tp->t_canq.c_cc < TTYHOG - 1) {
-                       iov = uio->uio_iov;
-                       if (iov->iov_len == 0) {
-                               uio->uio_iovcnt--;      
-                               uio->uio_iov++;
-                               continue;
-                       }
+               while (uio->uio_resid > 0 && tp->t_canq.c_cc < TTYHOG - 1) {

                        if (cc == 0) {
                        if (cc == 0) {

-                               cc = MIN(iov->iov_len, BUFSIZ);
-                               cc = MIN(cc, TTYHOG - 1 - tp->t_canq.c_cc);
+                               cc = min(uio->uio_resid, BUFSIZ);
+                               cc = min(cc, TTYHOG - 1 - tp->t_canq.c_cc);

                                cp = locbuf;
                                cp = locbuf;

-                               error = uiomove(cp, cc, UIO_WRITE, uio);
+                               error = uiomove((caddr_t)cp, cc, uio);

                                if (error)
                                        return (error);
                                /* check again for safety */
                                if (error)
                                        return (error);
                                /* check again for safety */


@@ -403,7 +460,7 @@ again:
                                        return (EIO);
                        }
                        if (cc)
                                        return (EIO);
                        }
                        if (cc)

-                               (void) b_to_q(cp, cc, &tp->t_canq);
+                               (void) b_to_q((char *)cp, cc, &tp->t_canq);

                        cc = 0;
                }
                (void) putc(0, &tp->t_canq);
                        cc = 0;
                }
                (void) putc(0, &tp->t_canq);


@@ -411,17 +468,11 @@ again:
                wakeup((caddr_t)&tp->t_canq);
                return (0);
        }
                wakeup((caddr_t)&tp->t_canq);
                return (0);
        }

-       while (uio->uio_iovcnt > 0) {
-               iov = uio->uio_iov;
+       while (uio->uio_resid > 0) {

                if (cc == 0) {
                if (cc == 0) {

-                       if (iov->iov_len == 0) {
-                               uio->uio_iovcnt--;      
-                               uio->uio_iov++;
-                               continue;
-                       }
-                       cc = MIN(iov->iov_len, BUFSIZ);
+                       cc = min(uio->uio_resid, BUFSIZ);

                        cp = locbuf;
                        cp = locbuf;

-                       error = uiomove(cp, cc, UIO_WRITE, uio);
+                       error = uiomove((caddr_t)cp, cc, uio);

                        if (error)
                                return (error);
                        /* check again for safety */
                        if (error)
                                return (error);
                        /* check again for safety */


@@ -430,7 +481,7 @@ again:
                }
                while (cc > 0) {
                        if ((tp->t_rawq.c_cc + tp->t_canq.c_cc) >= TTYHOG - 2 &&
                }
                while (cc > 0) {
                        if ((tp->t_rawq.c_cc + tp->t_canq.c_cc) >= TTYHOG - 2 &&

-                           (tp->t_canq.c_cc > 0)) {
+                          (tp->t_canq.c_cc > 0 || !(tp->t_iflag&ICANON))) {

                                wakeup((caddr_t)&tp->t_rawq);
                                goto block;
                        }
                                wakeup((caddr_t)&tp->t_rawq);
                                goto block;
                        }


@@ -448,16 +499,19 @@ block:
         */
        if ((tp->t_state&TS_CARR_ON) == 0)
                return (EIO);
         */
        if ((tp->t_state&TS_CARR_ON) == 0)
                return (EIO);

-       if (pti->pt_flags & PF_NBIO) {
-               iov->iov_base -= cc;
-               iov->iov_len += cc;
+       if (flag & IO_NDELAY) {
+               /* adjust for data copied in but not written */

                uio->uio_resid += cc;
                uio->uio_resid += cc;

-               uio->uio_offset -= cc;

                if (cnt == 0)
                        return (EWOULDBLOCK);
                return (0);
        }
                if (cnt == 0)
                        return (EWOULDBLOCK);
                return (0);
        }

-       sleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI);
+       if (error = tsleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI | PCATCH,
+           ttyout, 0)) {
+               /* adjust for data copied in but not written */
+               uio->uio_resid += cc;
+               return (error);
+       }

        goto again;
 }
 
        goto again;
 }
 


@@ -468,6 +522,7 @@ ptyioctl(dev, cmd, data, flag)
 {
        register struct tty *tp = &pt_tty[minor(dev)];
        register struct pt_ioctl *pti = &pt_ioctl[minor(dev)];
 {
        register struct tty *tp = &pt_tty[minor(dev)];
        register struct pt_ioctl *pti = &pt_ioctl[minor(dev)];

+       register u_char *cc = tp->t_cc;

        int stop, error;
        extern ttyinput();
 
        int stop, error;
        extern ttyinput();
 


@@ -475,9 +530,39 @@ ptyioctl(dev, cmd, data, flag)
         * IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG.
         * ttywflush(tp) will hang if there are characters in the outq.
         */
         * IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG.
         * ttywflush(tp) will hang if there are characters in the outq.
         */

+       if (cmd == TIOCEXT) {
+               /*
+                * When the EXTPROC bit is being toggled, we need
+                * to send an TIOCPKT_IOCTL if the packet driver
+                * is turned on.
+                */
+               if (*(int *)data) {
+                       if (pti->pt_flags & PF_PKT) {
+                               pti->pt_send |= TIOCPKT_IOCTL;
+                               ptcwakeup(tp);
+                       }
+                       tp->t_lflag |= EXTPROC;
+               } else {
+                       if ((tp->t_state & EXTPROC) &&
+                           (pti->pt_flags & PF_PKT)) {
+                               pti->pt_send |= TIOCPKT_IOCTL;
+                               ptcwakeup(tp);
+                       }
+                       tp->t_lflag &= ~EXTPROC;
+               }
+               return(0);
+       } else

        if (cdevsw[major(dev)].d_open == ptcopen)
                switch (cmd) {
 
        if (cdevsw[major(dev)].d_open == ptcopen)
                switch (cmd) {
 

+               case TIOCGPGRP:
+                       /*
+                        * We aviod calling ttioctl on the controller since,
+                        * in that case, tp must be the controlling terminal.
+                        */
+                       *(int *)data = tp->t_pgrp ? tp->t_pgrp->pg_id : 0;
+                       return (0);
+

                case TIOCPKT:
                        if (*(int *)data) {
                                if (pti->pt_flags & PF_UCNTL)
                case TIOCPKT:
                        if (*(int *)data) {
                                if (pti->pt_flags & PF_UCNTL)


@@ -504,21 +589,30 @@ ptyioctl(dev, cmd, data, flag)
                        ttyflush(tp, FREAD|FWRITE);
                        return (0);
 
                        ttyflush(tp, FREAD|FWRITE);
                        return (0);
 

-               case FIONBIO:
-                       if (*(int *)data)
-                               pti->pt_flags |= PF_NBIO;
-                       else
-                               pti->pt_flags &= ~PF_NBIO;
-                       return (0);
-
-               case TIOCSETP:
+               case TIOCSETP:          

                case TIOCSETN:
                case TIOCSETD:
                case TIOCSETN:
                case TIOCSETD:

+               case TIOCSETA:
+               case TIOCSETAW:
+               case TIOCSETAF:

                        while (getc(&tp->t_outq) >= 0)
                                ;
                        break;
                        while (getc(&tp->t_outq) >= 0)
                                ;
                        break;

+
+               case TIOCSIG:
+                       if (*(unsigned int *)data >= NSIG)
+                               return(EINVAL);
+                       if ((tp->t_lflag&NOFLSH) == 0)
+                               ttyflush(tp, FREAD|FWRITE);
+                       pgsignal(tp->t_pgrp, *(unsigned int *)data, 1);
+                       if ((*(unsigned int *)data == SIGINFO) &&
+                           ((tp->t_lflag&NOKERNINFO) == 0))
+                               ttyinfo(tp);
+                       return(0);

                }
                }

-       error = ttioctl(tp, cmd, data, flag);
+       error = (*linesw[tp->t_line].l_ioctl)(tp, cmd, data, flag);
+       if (error < 0)
+                error = ttioctl(tp, cmd, data, flag);

        /*
         * Since we use the tty queues internally,
         * pty's can't be switched to disciplines which overwrite
        /*
         * Since we use the tty queues internally,
         * pty's can't be switched to disciplines which overwrite


@@ -526,14 +620,14 @@ ptyioctl(dev, cmd, data, flag)
         * from here...
         */
        if (linesw[tp->t_line].l_rint != ttyinput) {
         * from here...
         */
        if (linesw[tp->t_line].l_rint != ttyinput) {

-               (*linesw[tp->t_line].l_close)(tp);
-               tp->t_line = 0;
-               (void)(*linesw[tp->t_line].l_open)(dev, tp);
+               (*linesw[tp->t_line].l_close)(tp, flag);
+               tp->t_line = TTYDISC;
+               (void)(*linesw[tp->t_line].l_open)(dev, tp, flag);

                error = ENOTTY;
        }
        if (error < 0) {
                if (pti->pt_flags & PF_UCNTL &&
                error = ENOTTY;
        }
        if (error < 0) {
                if (pti->pt_flags & PF_UCNTL &&

-                   (cmd & ~0xff) == _IO(u,0)) {
+                   (cmd & ~0xff) == UIOCCMD(0)) {

                        if (cmd & 0xff) {
                                pti->pt_ucntl = (u_char)cmd;
                                ptcwakeup(tp, FREAD);
                        if (cmd & 0xff) {
                                pti->pt_ucntl = (u_char)cmd;
                                ptcwakeup(tp, FREAD);


@@ -542,8 +636,30 @@ ptyioctl(dev, cmd, data, flag)
                }
                error = ENOTTY;
        }
                }
                error = ENOTTY;
        }

-       stop = (tp->t_flags & RAW) == 0 &&
-           tp->t_stopc == CTRL(s) && tp->t_startc == CTRL(q);
+       /*
+        * If external processing and packet mode send ioctl packet.
+        */
+       if ((tp->t_lflag&EXTPROC) && (pti->pt_flags & PF_PKT)) {
+               switch(cmd) {
+               case TIOCSETA:
+               case TIOCSETAW:
+               case TIOCSETAF:
+               case TIOCSETP:
+               case TIOCSETN:
+#ifdef COMPAT_43
+               case TIOCSETC:
+               case TIOCSLTC:
+               case TIOCLBIS:
+               case TIOCLBIC:
+               case TIOCLSET:
+#endif
+                       pti->pt_send |= TIOCPKT_IOCTL;
+               default:
+                       break;
+               }
+       }
+       stop = (tp->t_iflag & IXON) && CCEQ(cc[VSTOP], CTRL('s')) 
+               && CCEQ(cc[VSTART], CTRL('q'));

        if (pti->pt_flags & PF_NOSTOP) {
                if (stop) {
                        pti->pt_send &= ~TIOCPKT_NOSTOP;
        if (pti->pt_flags & PF_NOSTOP) {
                if (stop) {
                        pti->pt_send &= ~TIOCPKT_NOSTOP;