add SO_TYPE option (get only!), correct mbuf lengths

[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 d50c3b3..84d9db6 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -1,4 +1,10 @@
-/*     tty_pty.c       6.5     84/07/29        */
+/*
+ * Copyright (c) 1982 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ *
+ *     @(#)tty_pty.c   6.17 (Berkeley) %G%
+ */

 
 /*
  * Pseudo-teletype Driver
 
 /*
  * Pseudo-teletype Driver


@@ -7,36 +13,38 @@
 #include "pty.h"
 
 #if NPTY > 0
 #include "pty.h"
 
 #if NPTY > 0

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/ioctl.h"
-#include "../h/tty.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/conf.h"
-#include "../h/file.h"
-#include "../h/proc.h"
-#include "../h/uio.h"
-#include "../h/kernel.h"
+#include "param.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"

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

-#undef NPTY
+#undef NPTY

 #define        NPTY    32              /* crude XXX */
 #endif
 
 #define BUFSIZ 100             /* Chunk size iomoved to/from user */
 
 /*
 #define        NPTY    32              /* crude XXX */
 #endif
 
 #define BUFSIZ 100             /* Chunk size iomoved to/from user */
 
 /*

- * pts == /dev/tty[pP]?
- * ptc == /dev/ptp[pP]?
+ * pts == /dev/tty[pqrs]?
+ * ptc == /dev/pty[pqrs]?

  */
 struct tty pt_tty[NPTY];
 struct pt_ioctl {
        int     pt_flags;
        int     pt_gensym;
        struct  proc *pt_selr, *pt_selw;
  */
 struct tty pt_tty[NPTY];
 struct pt_ioctl {
        int     pt_flags;
        int     pt_gensym;
        struct  proc *pt_selr, *pt_selw;

-       int     pt_send;
+       u_char  pt_send;
+       u_char  pt_ucntl;

 } pt_ioctl[NPTY];
 } pt_ioctl[NPTY];

+int    npty = NPTY;            /* for pstat -t */

 
 #define        PF_RCOLL        0x01
 #define        PF_WCOLL        0x02
 
 #define        PF_RCOLL        0x01
 #define        PF_WCOLL        0x02


@@ -45,13 +53,18 @@ struct      pt_ioctl {
 #define        PF_STOPPED      0x10            /* user told stopped */
 #define        PF_REMOTE       0x20            /* remote and flow controlled input */
 #define        PF_NOSTOP       0x40
 #define        PF_STOPPED      0x10            /* user told stopped */
 #define        PF_REMOTE       0x20            /* remote and flow controlled input */
 #define        PF_NOSTOP       0x40

+#define PF_UCNTL       0x80            /* user control mode */

 
 /*ARGSUSED*/
 ptsopen(dev, flag)
        dev_t dev;
 {
        register struct tty *tp;
 
 /*ARGSUSED*/
 ptsopen(dev, flag)
        dev_t dev;
 {
        register struct tty *tp;

+       int error;

 
 

+#ifdef lint
+       npty = npty;
+#endif

        if (minor(dev) >= NPTY)
                return (ENXIO);
        tp = &pt_tty[minor(dev)];
        if (minor(dev) >= NPTY)
                return (ENXIO);
        tp = &pt_tty[minor(dev)];


@@ -67,7 +80,9 @@ ptsopen(dev, flag)
                tp->t_state |= TS_WOPEN;
                sleep((caddr_t)&tp->t_rawq, TTIPRI);
        }
                tp->t_state |= TS_WOPEN;
                sleep((caddr_t)&tp->t_rawq, TTIPRI);
        }

-       return ((*linesw[tp->t_line].l_open)(dev, tp));
+       error = (*linesw[tp->t_line].l_open)(dev, tp);
+       ptcwakeup(tp, FREAD|FWRITE);
+       return (error);

 }
 
 ptsclose(dev)
 }
 
 ptsclose(dev)


@@ -78,7 +93,7 @@ ptsclose(dev)
        tp = &pt_tty[minor(dev)];
        (*linesw[tp->t_line].l_close)(tp);
        ttyclose(tp);
        tp = &pt_tty[minor(dev)];
        (*linesw[tp->t_line].l_close)(tp);
        ttyclose(tp);

-       ptcwakeup(tp);
+       ptcwakeup(tp, FREAD|FWRITE);

 }
 
 ptsread(dev, uio)
 }
 
 ptsread(dev, uio)


@@ -92,42 +107,32 @@ ptsread(dev, uio)
 again:
        if (pti->pt_flags & PF_REMOTE) {
                while (tp == u.u_ttyp && u.u_procp->p_pgrp != tp->t_pgrp) {
 again:
        if (pti->pt_flags & PF_REMOTE) {
                while (tp == u.u_ttyp && u.u_procp->p_pgrp != tp->t_pgrp) {

-#define bit(a) (1<<(a-1))
-                       if ((u.u_procp->p_sigignore & bit(SIGTTIN)) ||
-                           (u.u_procp->p_sigmask & bit(SIGTTIN)) ||
-       /*
-                           (u.u_procp->p_flag&SDETACH) ||
-       */
+                       if ((u.u_procp->p_sigignore & sigmask(SIGTTIN)) ||
+                           (u.u_procp->p_sigmask & sigmask(SIGTTIN)) ||

                            u.u_procp->p_flag&SVFORK)
                                return (EIO);
                        gsignal(u.u_procp->p_pgrp, SIGTTIN);
                        sleep((caddr_t)&lbolt, TTIPRI);
                }
                            u.u_procp->p_flag&SVFORK)
                                return (EIO);
                        gsignal(u.u_procp->p_pgrp, SIGTTIN);
                        sleep((caddr_t)&lbolt, TTIPRI);
                }

-#undef bit
-               if (tp->t_rawq.c_cc == 0) {
+               if (tp->t_canq.c_cc == 0) {

                        if (tp->t_state & TS_NBIO)
                                return (EWOULDBLOCK);
                        if (tp->t_state & TS_NBIO)
                                return (EWOULDBLOCK);

-                       sleep((caddr_t)&tp->t_rawq, TTIPRI);
+                       sleep((caddr_t)&tp->t_canq, TTIPRI);

                        goto again;
                }
                        goto again;
                }

-               while (tp->t_rawq.c_cc > 1 && uio->uio_resid > 0)
-                       if (ureadc(getc(&tp->t_rawq), uio) < 0) {
+               while (tp->t_canq.c_cc > 1 && uio->uio_resid > 0)
+                       if (ureadc(getc(&tp->t_canq), uio) < 0) {

                                error = EFAULT;
                                break;
                        }
                                error = EFAULT;
                                break;
                        }

-               if (tp->t_rawq.c_cc == 1)
-                       (void) getc(&tp->t_rawq);
-               if (tp->t_rawq.c_cc)
+               if (tp->t_canq.c_cc == 1)
+                       (void) getc(&tp->t_canq);
+               if (tp->t_canq.c_cc)

                        return (error);
        } else
                if (tp->t_oproc)
                        error = (*linesw[tp->t_line].l_read)(tp, uio);
                        return (error);
        } else
                if (tp->t_oproc)
                        error = (*linesw[tp->t_line].l_read)(tp, uio);

-       wakeup((caddr_t)&tp->t_rawq.c_cf);
-       if (pti->pt_selw) {
-               selwakeup(pti->pt_selw, pti->pt_flags & PF_WCOLL);
-               pti->pt_selw = 0;
-               pti->pt_flags &= ~PF_WCOLL;
-       }
+       ptcwakeup(tp, FWRITE);

        return (error);
 }
 
        return (error);
 }
 


@@ -163,20 +168,30 @@ ptsstart(tp)
                pti->pt_flags &= ~PF_STOPPED;
                pti->pt_send = TIOCPKT_START;
        }
                pti->pt_flags &= ~PF_STOPPED;
                pti->pt_send = TIOCPKT_START;
        }

-       ptcwakeup(tp);
+       ptcwakeup(tp, FREAD);

 }
 
 }
 

-ptcwakeup(tp)
+ptcwakeup(tp, flag)

        struct tty *tp;
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
 
        struct tty *tp;
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
 

-       if (pti->pt_selr) {
-               selwakeup(pti->pt_selr, pti->pt_flags & PF_RCOLL);
-               pti->pt_selr = 0;
-               pti->pt_flags &= ~PF_RCOLL;
+       if (flag & FREAD) {
+               if (pti->pt_selr) {
+                       selwakeup(pti->pt_selr, pti->pt_flags & PF_RCOLL);
+                       pti->pt_selr = 0;
+                       pti->pt_flags &= ~PF_RCOLL;
+               }
+               wakeup((caddr_t)&tp->t_outq.c_cf);
+       }
+       if (flag & FWRITE) {
+               if (pti->pt_selw) {
+                       selwakeup(pti->pt_selw, pti->pt_flags & PF_WCOLL);
+                       pti->pt_selw = 0;
+                       pti->pt_flags &= ~PF_WCOLL;
+               }
+               wakeup((caddr_t)&tp->t_rawq.c_cf);

        }
        }

-       wakeup((caddr_t)&tp->t_outq.c_cf);

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/


@@ -193,12 +208,12 @@ ptcopen(dev, flag)
        if (tp->t_oproc)
                return (EIO);
        tp->t_oproc = ptsstart;
        if (tp->t_oproc)
                return (EIO);
        tp->t_oproc = ptsstart;

-       if (tp->t_state & TS_WOPEN)
-               wakeup((caddr_t)&tp->t_rawq);
+       (void)(*linesw[tp->t_line].l_modem)(tp, 1);

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

+       pti->pt_ucntl = 0;

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


@@ -208,10 +223,7 @@ ptcclose(dev)
        register struct tty *tp;
 
        tp = &pt_tty[minor(dev)];
        register struct tty *tp;
 
        tp = &pt_tty[minor(dev)];

-       if (tp->t_state & TS_ISOPEN)
-               gsignal(tp->t_pgrp, SIGHUP);
-       tp->t_state &= ~TS_CARR_ON;     /* virtual carrier gone */
-       ttyflush(tp, FREAD|FWRITE);
+       (void)(*linesw[tp->t_line].l_modem)(tp, 0);

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


@@ -220,30 +232,43 @@ ptcread(dev, uio)
        struct uio *uio;
 {
        register struct tty *tp = &pt_tty[minor(dev)];
        struct uio *uio;
 {
        register struct tty *tp = &pt_tty[minor(dev)];

-       struct pt_ioctl *pti;
+       struct pt_ioctl *pti = &pt_ioctl[minor(dev)];

        char buf[BUFSIZ];
        int error = 0, cc;
 
        char buf[BUFSIZ];
        int error = 0, cc;
 

-       if ((tp->t_state&(TS_CARR_ON|TS_ISOPEN)) == 0)
-               return (EIO);
-       pti = &pt_ioctl[minor(dev)];
-       if (pti->pt_flags & PF_PKT) {
-               if (pti->pt_send) {
-                       error = ureadc(pti->pt_send, uio);
-                       if (error)
-                               return (error);
-                       pti->pt_send = 0;
-                       return (0);
+       /*
+        * We want to block until the slave
+        * is open, and there's something to read;
+        * but if we lost the slave or we're NBIO,
+        * then return the appropriate error instead.
+        */
+       for (;;) {
+               if (tp->t_state&TS_ISOPEN) {
+                       if (pti->pt_flags&PF_PKT && pti->pt_send) {
+                               error = ureadc(pti->pt_send, uio);
+                               if (error)
+                                       return (error);
+                               pti->pt_send = 0;
+                               return (0);
+                       }
+                       if (pti->pt_flags&PF_UCNTL && pti->pt_ucntl) {
+                               error = ureadc(pti->pt_ucntl, uio);
+                               if (error)
+                                       return (error);
+                               pti->pt_ucntl = 0;
+                               return (0);
+                       }
+                       if (tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0)
+                               break;

                }
                }

-               error = ureadc(0, uio);
-       }
-       while (tp->t_outq.c_cc == 0 || (tp->t_state&TS_TTSTOP)) {

                if ((tp->t_state&TS_CARR_ON) == 0)
                        return (EIO);
                if (pti->pt_flags&PF_NBIO)
                        return (EWOULDBLOCK);
                sleep((caddr_t)&tp->t_outq.c_cf, TTIPRI);
        }
                if ((tp->t_state&TS_CARR_ON) == 0)
                        return (EIO);
                if (pti->pt_flags&PF_NBIO)
                        return (EWOULDBLOCK);
                sleep((caddr_t)&tp->t_outq.c_cf, TTIPRI);
        }

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

        while (uio->uio_resid > 0 && error == 0) {
                cc = q_to_b(&tp->t_outq, buf, MIN(uio->uio_resid, BUFSIZ));
                if (cc <= 0)
        while (uio->uio_resid > 0 && error == 0) {
                cc = q_to_b(&tp->t_outq, buf, MIN(uio->uio_resid, BUFSIZ));
                if (cc <= 0)


@@ -269,16 +294,22 @@ ptsstop(tp, flush)
        int flush;
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
        int flush;
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];

+       int flag;

 
        /* note: FLUSHREAD and FLUSHWRITE already ok */
        if (flush == 0) {
                flush = TIOCPKT_STOP;
                pti->pt_flags |= PF_STOPPED;
 
        /* note: FLUSHREAD and FLUSHWRITE already ok */
        if (flush == 0) {
                flush = TIOCPKT_STOP;
                pti->pt_flags |= PF_STOPPED;

-       } else {
+       } else

                pti->pt_flags &= ~PF_STOPPED;
                pti->pt_flags &= ~PF_STOPPED;

-       }

        pti->pt_send |= flush;
        pti->pt_send |= flush;

-       ptcwakeup(tp);
+       /* change of perspective */
+       flag = 0;
+       if (flush & FREAD)
+               flag |= FWRITE;
+       if (flush & FWRITE)
+               flag |= FREAD;
+       ptcwakeup(tp, flag);

 }
 
 ptcselect(dev, rw)
 }
 
 ptcselect(dev, rw)


@@ -290,13 +321,23 @@ ptcselect(dev, rw)
        struct proc *p;
        int s;
 
        struct proc *p;
        int s;
 

-       if ((tp->t_state&(TS_CARR_ON|TS_ISOPEN)) == 0)
+       if ((tp->t_state&TS_CARR_ON) == 0)

                return (1);
        s = spl5();
        switch (rw) {
 
        case FREAD:
                return (1);
        s = spl5();
        switch (rw) {
 
        case FREAD:

-               if (tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0) {
+               if ((tp->t_state&TS_ISOPEN) &&
+                    tp->t_outq.c_cc && (tp->t_state&TS_TTSTOP) == 0) {
+                       splx(s);
+                       return (1);
+               }
+               /* 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);
                        return (1);
                }
                        splx(s);
                        return (1);
                }


@@ -306,8 +347,10 @@ ptcselect(dev, rw)
                        pti->pt_selr = u.u_procp;
                break;
 
                        pti->pt_selr = u.u_procp;
                break;
 

+

        case FWRITE:
        case FWRITE:

-               if ((pti->pt_flags & PF_REMOTE) == 0 || tp->t_rawq.c_cc == 0) {
+               if ((tp->t_state&TS_ISOPEN) &&
+                   ((pti->pt_flags&PF_REMOTE) == 0 || tp->t_canq.c_cc == 0)) {

                        splx(s);
                        return (1);
                }
                        splx(s);
                        return (1);
                }


@@ -316,6 +359,7 @@ ptcselect(dev, rw)
                else
                        pti->pt_selw = u.u_procp;
                break;
                else
                        pti->pt_selw = u.u_procp;
                break;

+

        }
        splx(s);
        return (0);
        }
        splx(s);
        return (0);


@@ -323,84 +367,98 @@ ptcselect(dev, rw)
 
 ptcwrite(dev, uio)
        dev_t dev;
 
 ptcwrite(dev, uio)
        dev_t dev;

-       struct uio *uio;
+       register struct uio *uio;

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

-       register char *cp, *ce;
-       register int cc;
+       register struct iovec *iov;
+       register char *cp;
+       register int cc = 0;

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

-       if ((tp->t_state&(TS_CARR_ON|TS_ISOPEN)) == 0)
-               return (EIO);
-       do {
-               register struct iovec *iov;
-
-               if (uio->uio_iovcnt == 0)
-                       break;
-               iov = uio->uio_iov;
-               if (iov->iov_len == 0) {
-                       while (pti->pt_flags&PF_REMOTE && tp->t_rawq.c_cc != 0)
-                               sleep((caddr_t)&tp->t_rawq.c_cf, TTIPRI);
-                       if (pti->pt_flags&PF_REMOTE) {
-                               (void) putc(0, &tp->t_rawq);
-                               wakeup((caddr_t)&tp->t_rawq);
+again:
+       if ((tp->t_state&TS_ISOPEN) == 0)
+               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;
+                       }
+                       if (cc == 0) {
+                               cc = MIN(iov->iov_len, BUFSIZ);
+                               cc = MIN(cc, TTYHOG - 1 - tp->t_canq.c_cc);
+                               cp = locbuf;
+                               error = uiomove(cp, cc, UIO_WRITE, uio);
+                               if (error)
+                                       return (error);
+                               /* check again for safety */
+                               if ((tp->t_state&TS_ISOPEN) == 0)
+                                       return (EIO);

                        }
                        }

-                       uio->uio_iovcnt--;      
-                       uio->uio_iov++;
-                       if (uio->uio_iovcnt < 0)
-                               panic("ptcwrite");
-                       continue;
+                       if (cc)
+                               (void) b_to_q(cp, cc, &tp->t_canq);
+                       cc = 0;

                }
                }

-               cc = MIN(iov->iov_len, BUFSIZ);
-               cp = locbuf;
-               error = uiomove(cp, cc, UIO_WRITE, uio);
-               if (error)
-                       break;
-               ce = cp + cc;
-again:
-               if (pti->pt_flags & PF_REMOTE) {
-                       if (tp->t_rawq.c_cc) {
-                               if (pti->pt_flags & PF_NBIO) {
-                                       iov->iov_base -= ce - cp;
-                                       iov->iov_len += ce - cp;
-                                       uio->uio_resid += ce - cp;
-                                       uio->uio_offset -= ce - cp;
-                                       return (EWOULDBLOCK);
-                               }
-                               sleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI);
-                               goto again;
+               (void) putc(0, &tp->t_canq);
+               ttwakeup(tp);
+               wakeup((caddr_t)&tp->t_canq);
+               return (0);
+       }
+       while (uio->uio_iovcnt > 0) {
+               iov = uio->uio_iov;
+               if (cc == 0) {
+                       if (iov->iov_len == 0) {
+                               uio->uio_iovcnt--;      
+                               uio->uio_iov++;
+                               continue;

                        }
                        }

-                       (void) b_to_q(cp, cc, &tp->t_rawq);
-                       (void) putc(0, &tp->t_rawq);
-                       wakeup((caddr_t)&tp->t_rawq);
-                       return (0);
+                       cc = MIN(iov->iov_len, BUFSIZ);
+                       cp = locbuf;
+                       error = uiomove(cp, cc, UIO_WRITE, uio);
+                       if (error)
+                               return (error);
+                       /* check again for safety */
+                       if ((tp->t_state&TS_ISOPEN) == 0)
+                               return (EIO);

                }
                }

-               while (cp < ce) {
+               while (cc > 0) {

                        if ((tp->t_rawq.c_cc + tp->t_canq.c_cc) >= TTYHOG - 2 &&
                            (tp->t_canq.c_cc > 0)) {
                                wakeup((caddr_t)&tp->t_rawq);
                        if ((tp->t_rawq.c_cc + tp->t_canq.c_cc) >= TTYHOG - 2 &&
                            (tp->t_canq.c_cc > 0)) {
                                wakeup((caddr_t)&tp->t_rawq);

-                               if (tp->t_state & TS_NBIO) {
-                                       iov->iov_base -= ce - cp;
-                                       iov->iov_len += ce - cp;
-                                       uio->uio_resid += ce - cp;
-                                       uio->uio_offset -= ce - cp;
-                                       if (cnt == 0)
-                                               return (EWOULDBLOCK);
-                                       return (0);
-                               }
-                               /* Better than just flushing it! */
-                               /* Wait for something to be read */
-                               sleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI);
-                               goto again;
+                               goto block;

                        }
                        (*linesw[tp->t_line].l_rint)(*cp++, tp);
                        cnt++;
                        }
                        (*linesw[tp->t_line].l_rint)(*cp++, tp);
                        cnt++;

+                       cc--;

                }
                }

-       } while (uio->uio_resid);
-       return (error);
+               cc = 0;
+       }
+       return (0);
+block:
+       /*
+        * Come here to wait for slave to open, for space
+        * in outq, or space in rawq.
+        */
+       if ((tp->t_state&TS_CARR_ON) == 0)
+               return (EIO);
+       if (pti->pt_flags & PF_NBIO) {
+               iov->iov_base -= cc;
+               iov->iov_len += cc;
+               uio->uio_resid += cc;
+               uio->uio_offset -= cc;
+               if (cnt == 0)
+                       return (EWOULDBLOCK);
+               return (0);
+       }
+       sleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI);
+       goto again;

 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/


@@ -410,19 +468,34 @@ 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)];

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

 
 

-       /* IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG ??? */
+       /*
+        * IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG.
+        * ttywflush(tp) will hang if there are characters in the outq.
+        */

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

-                       if (*(int *)data)
+                       if (*(int *)data) {
+                               if (pti->pt_flags & PF_UCNTL)
+                                       return (EINVAL);

                                pti->pt_flags |= PF_PKT;
                                pti->pt_flags |= PF_PKT;

-                       else
+                       } else

                                pti->pt_flags &= ~PF_PKT;
                        return (0);
 
                                pti->pt_flags &= ~PF_PKT;
                        return (0);
 

+               case TIOCUCNTL:
+                       if (*(int *)data) {
+                               if (pti->pt_flags & PF_PKT)
+                                       return (EINVAL);
+                               pti->pt_flags |= PF_UCNTL;
+                       } else
+                               pti->pt_flags &= ~PF_UCNTL;
+                       return (0);
+

                case TIOCREMOTE:
                        if (*(int *)data)
                                pti->pt_flags |= PF_REMOTE;
                case TIOCREMOTE:
                        if (*(int *)data)
                                pti->pt_flags |= PF_REMOTE;


@@ -439,31 +512,53 @@ ptyioctl(dev, cmd, data, flag)
                        return (0);
 
                case TIOCSETP:
                        return (0);
 
                case TIOCSETP:

+               case TIOCSETN:
+               case TIOCSETD:

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

-       error = ttioctl(tp, cmd, data, dev);
-       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
+        * the queues.  We can't tell anything about the discipline
+        * 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);

                error = ENOTTY;
                error = ENOTTY;

-       { int stop = (tp->t_stopc == ('s'&037) &&
-                     tp->t_startc == ('q'&037));
+       }
+       if (error < 0) {
+               if (pti->pt_flags & PF_UCNTL &&
+                   (cmd & ~0xff) == _IO(u,0)) {
+                       if (cmd & 0xff) {
+                               pti->pt_ucntl = (u_char)cmd;
+                               ptcwakeup(tp, FREAD);
+                       }
+                       return (0);
+               }
+               error = ENOTTY;
+       }
+       stop = (tp->t_flags & RAW) == 0 &&
+           tp->t_stopc == CTRL(s) && tp->t_startc == CTRL(q);

        if (pti->pt_flags & PF_NOSTOP) {
                if (stop) {
        if (pti->pt_flags & PF_NOSTOP) {
                if (stop) {

-                       pti->pt_send &= TIOCPKT_NOSTOP;
+                       pti->pt_send &= ~TIOCPKT_NOSTOP;

                        pti->pt_send |= TIOCPKT_DOSTOP;
                        pti->pt_flags &= ~PF_NOSTOP;
                        pti->pt_send |= TIOCPKT_DOSTOP;
                        pti->pt_flags &= ~PF_NOSTOP;

-                       ptcwakeup(tp);
+                       ptcwakeup(tp, FREAD);

                }
        } else {
                }
        } else {

-               if (stop == 0) {
+               if (!stop) {

                        pti->pt_send &= ~TIOCPKT_DOSTOP;
                        pti->pt_send |= TIOCPKT_NOSTOP;
                        pti->pt_flags |= PF_NOSTOP;
                        pti->pt_send &= ~TIOCPKT_DOSTOP;
                        pti->pt_send |= TIOCPKT_NOSTOP;
                        pti->pt_flags |= PF_NOSTOP;

-                       ptcwakeup(tp);
+                       ptcwakeup(tp, FREAD);

                }
        }
                }
        }

-       }

        return (error);
 }
 #endif
        return (error);
 }
 #endif