fix bug that can cause recursive .forward files to fail

[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 f0c6217..04f9af1 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -1,30 +1,28 @@
 /*
 /*

- * Copyright (c) 1982, 1986, 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1982, 1986, 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_pty.c   7.17 (Berkeley) %G%
+ *     @(#)tty_pty.c   8.1 (Berkeley) %G%

  */
 
 /*
  * Pseudo-teletype Driver
  * (Actually two drivers, requiring two entries in 'cdevsw')
  */
  */
 
 /*
  * Pseudo-teletype Driver
  * (Actually two drivers, requiring two entries in 'cdevsw')
  */

-#include "pty.h"
-
-#if NPTY > 0
-#include "param.h"
-#include "systm.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "user.h"
-#include "conf.h"
-#include "file.h"
-#include "proc.h"
-#include "uio.h"
-#include "kernel.h"
-#include "vnode.h"
+#include "pty.h"               /* XXX */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/conf.h>
+#include <sys/file.h>
+#include <sys/uio.h>
+#include <sys/kernel.h>
+#include <sys/vnode.h>

 #include "tsleep.h"
 
 #if NPTY == 1
 #include "tsleep.h"
 
 #if NPTY == 1


@@ -38,18 +36,16 @@
  * pts == /dev/tty[pqrs]?
  * ptc == /dev/pty[pqrs]?
  */
  * pts == /dev/tty[pqrs]?
  * ptc == /dev/pty[pqrs]?
  */

-struct tty pt_tty[NPTY];
+struct tty pt_tty[NPTY];       /* XXX */

 struct pt_ioctl {
        int     pt_flags;
 struct pt_ioctl {
        int     pt_flags;

-       struct  proc *pt_selr, *pt_selw;
+       struct  selinfo pt_selr, pt_selw;

        u_char  pt_send;
        u_char  pt_ucntl;
        struct  clist pt_ioc;
        u_char  pt_send;
        u_char  pt_ucntl;
        struct  clist pt_ioc;

-} pt_ioctl[NPTY];
+} pt_ioctl[NPTY];              /* XXX */

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

-int ptydebug = 0;
-

 #define        PF_RCOLL        0x0001
 #define        PF_WCOLL        0x0002
 #define        PF_NBIO         0x0004
 #define        PF_RCOLL        0x0001
 #define        PF_WCOLL        0x0002
 #define        PF_NBIO         0x0004


@@ -64,17 +60,45 @@ int ptydebug = 0;
 #define        PF_BLOCK        0x0800          /* block writes to slave */
 #define        PF_OWAIT        0x1000          /* waiting for PF_BLOCK to clear */
 
 #define        PF_BLOCK        0x0800          /* block writes to slave */
 #define        PF_OWAIT        0x1000          /* waiting for PF_BLOCK to clear */
 

+void   ptsstop __P((struct tty *, int));
+
+/*
+ * Establish n (or default if n is 1) ptys in the system.
+ *
+ * XXX cdevsw & pstat require the array `pty[]' to be an array
+ */
+void
+ptyattach(n)
+       int n;
+{
+#ifdef notyet
+       char *mem;
+       register u_long ntb;
+#define        DEFAULT_NPTY    32
+
+       /* maybe should allow 0 => none? */
+       if (n <= 1)
+               n = DEFAULT_NPTY;
+       ntb = n * sizeof(struct tty);
+       mem = malloc(ntb + ALIGNBYTES + n * sizeof(struct pt_ioctl),
+           M_DEVBUF, M_WAITOK);
+       pt_tty = (struct tty *)mem;
+       mem = (char *)ALIGN(mem + ntb);
+       pt_ioctl = (struct pt_ioctl *)mem;
+       npty = n;
+#endif
+}
+

 /*ARGSUSED*/
 /*ARGSUSED*/

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

        dev_t dev;
        dev_t dev;

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

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

-#ifdef lint
-       npty = npty;
-#endif
-       if (minor(dev) >= NPTY)
+       if (minor(dev) >= npty)

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


@@ -86,52 +110,58 @@ ptsopen(dev, flag)
                tp->t_cflag = TTYDEF_CFLAG;
                tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
                ttsetwater(tp);         /* would be done in xxparam() */
                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 && u.u_uid != 0)
+       } 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;

-               if (flag&FNDELAY)
+               if (flag&FNONBLOCK)

                        break;
                if (error = ttysleep(tp, (caddr_t)&tp->t_rawq, TTIPRI | PCATCH,
                    ttopen, 0))
                        return (error);
        }
                        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, flag);
+       error = (*linesw[tp->t_line].l_open)(dev, tp);

        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;
 {
        register struct tty *tp;

+       int err;

 
        tp = &pt_tty[minor(dev)];
 
        tp = &pt_tty[minor(dev)];

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

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

+       return (err);

        return (0);
 }
 
 ptsread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
        return (0);
 }
 
 ptsread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

 {
 {

+       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 (isbackground(u.u_procp, tp)) {
-                       if ((u.u_procp->p_sigignore & sigmask(SIGTTIN)) ||
-                           (u.u_procp->p_sigmask & sigmask(SIGTTIN)) ||
-                           u.u_procp->p_pgrp->pg_jobc == 0 ||
-                           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);

-                       pgsignal(u.u_procp->p_pgrp, SIGTTIN, 1);
+                       pgsignal(p->p_pgrp, SIGTTIN, 1);

                        if (error = ttysleep(tp, (caddr_t)&lbolt, 
                            TTIPRI | PCATCH, ttybg, 0))
                                return (error);
                        if (error = ttysleep(tp, (caddr_t)&lbolt, 
                            TTIPRI | PCATCH, ttybg, 0))
                                return (error);


@@ -168,6 +198,7 @@ again:
 ptswrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 ptswrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int 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)];


@@ -187,6 +218,7 @@ ptswrite(dev, uio, flag)
  * Start output on pseudo-tty.
  * Wake up process selecting or sleeping for input from controlling tty.
  */
  * Start output on pseudo-tty.
  * Wake up process selecting or sleeping for input from controlling tty.
  */

+void

 ptsstart(tp)
        struct tty *tp;
 {
 ptsstart(tp)
        struct tty *tp;
 {


@@ -203,42 +235,42 @@ ptsstart(tp)
 
 ptcwakeup(tp, flag)
        struct tty *tp;
 
 ptcwakeup(tp, flag)
        struct tty *tp;

+       int flag;

 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
 
        if (flag & FREAD) {
 {
        struct pt_ioctl *pti = &pt_ioctl[minor(tp->t_dev)];
 
        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;
-               }
+               selwakeup(&pti->pt_selr);

                wakeup((caddr_t)&tp->t_outq.c_cf);
        }
        if (flag & FWRITE) {
                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;
-               }
-if (ptydebug) printf("WAKEUP c_cf %d\n", u.u_procp->p_pid);
+               selwakeup(&pti->pt_selw);

                wakeup((caddr_t)&tp->t_rawq.c_cf);
        }
 }
 
 /*ARGSUSED*/
                wakeup((caddr_t)&tp->t_rawq.c_cf);
        }
 }
 
 /*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;
 

-       if (minor(dev) >= NPTY)
+       if (minor(dev) >= npty)

                return (ENXIO);
        tp = &pt_tty[minor(dev)];
        if (tp->t_oproc)
                return (EIO);
        tp->t_oproc = ptsstart;
                return (ENXIO);
        tp = &pt_tty[minor(dev)];
        if (tp->t_oproc)
                return (EIO);
        tp->t_oproc = ptsstart;

+#ifdef sun4c
+       tp->t_stop = ptsstop;
+#endif

        (void)(*linesw[tp->t_line].l_modem)(tp, 1);
        tp->t_lflag &= ~EXTPROC;
        pti = &pt_ioctl[minor(dev)];
        (void)(*linesw[tp->t_line].l_modem)(tp, 1);
        tp->t_lflag &= ~EXTPROC;
        pti = &pt_ioctl[minor(dev)];


@@ -259,11 +291,13 @@ ptcclose(dev)
        tp->t_oproc = 0;                /* mark closed */
        tp->t_session = 0;
        return (0);
        tp->t_oproc = 0;                /* mark closed */
        tp->t_session = 0;
        return (0);

+       return (0);

 }
 
 ptcread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 }
 
 ptcread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

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


@@ -283,7 +317,7 @@ ptcread(dev, uio, flag)
                                if (error)
                                        return (error);
                                if (pti->pt_send & TIOCPKT_IOCTL) {
                                if (error)
                                        return (error);
                                if (pti->pt_send & TIOCPKT_IOCTL) {

-                                       cc = MIN(uio->uio_resid,
+                                       cc = min(uio->uio_resid,

                                                sizeof(tp->t_termios));
                                        uiomove(&tp->t_termios, cc, uio);
                                }
                                                sizeof(tp->t_termios));
                                        uiomove(&tp->t_termios, cc, uio);
                                }


@@ -324,7 +358,7 @@ ptcread(dev, uio, flag)
        if (pti->pt_flags & (PF_PKT|PF_UCNTL|PF_TIOC))
                error = ureadc(0, uio);
        while (uio->uio_resid > 0 && error == 0) {
        if (pti->pt_flags & (PF_PKT|PF_UCNTL|PF_TIOC))
                error = ureadc(0, uio);
        while (uio->uio_resid > 0 && error == 0) {

-               cc = q_to_b(&tp->t_outq, buf, MIN(uio->uio_resid, BUFSIZ));
+               cc = q_to_b(&tp->t_outq, buf, min(uio->uio_resid, BUFSIZ));

                if (cc <= 0)
                        break;
                error = uiomove(buf, cc, uio);
                if (cc <= 0)
                        break;
                error = uiomove(buf, cc, uio);


@@ -334,6 +368,7 @@ ptcread(dev, uio, flag)
        return (error);
 }
 
        return (error);
 }
 

+void

 ptswake(tp)
        register struct tty *tp;
 {
 ptswake(tp)
        register struct tty *tp;
 {


@@ -371,13 +406,13 @@ 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;

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


@@ -403,10 +438,7 @@ ptcselect(dev, rw)
                     pti->pt_flags&PF_TIOC && pti->pt_ioc.c_cc ||
                     pti->pt_flags&PF_UCNTL && pti->pt_ucntl))
                        return (1);
                     pti->pt_flags&PF_TIOC && pti->pt_ioc.c_cc ||
                     pti->pt_flags&PF_UCNTL && pti->pt_ucntl))
                        return (1);

-               if ((p = pti->pt_selr) && p->p_wchan == (caddr_t)&selwait)
-                       pti->pt_flags |= PF_RCOLL;
-               else
-                       pti->pt_selr = u.u_procp;
+               selrecord(p, &pti->pt_selr);

                break;
 
 
                break;
 
 


@@ -422,10 +454,7 @@ ptcselect(dev, rw)
                                    return (1);
                        }
                }
                                    return (1);
                        }
                }

-               if ((p = pti->pt_selw) && p->p_wchan == (caddr_t)&selwait)
-                       pti->pt_flags |= PF_WCOLL;
-               else
-                       pti->pt_selw = u.u_procp;
+               selrecord(p, &pti->pt_selw);

                break;
 
        }
                break;
 
        }


@@ -435,6 +464,7 @@ ptcselect(dev, rw)
 ptcwrite(dev, uio, flag)
        dev_t dev;
        register struct uio *uio;
 ptcwrite(dev, uio, flag)
        dev_t dev;
        register struct uio *uio;

+       int flag;

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


@@ -519,15 +549,17 @@ block:
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-ptyioctl(dev, cmd, data, flag)
-       caddr_t data;
+ptyioctl(dev, cmd, data, flag, p)

        dev_t dev;
        dev_t dev;

+       int cmd;
+       caddr_t data;
+       int flag;
+       struct proc *p;

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

 
        /*
         * IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG.
 
        /*
         * IF CONTROLLER STTY THEN MUST FLUSH TO PREVENT A HANG.


@@ -542,14 +574,14 @@ ptyioctl(dev, cmd, data, flag)
                if (*(int *)data) {
                        if (pti->pt_flags & PF_PKT) {
                                pti->pt_send |= TIOCPKT_IOCTL;
                if (*(int *)data) {
                        if (pti->pt_flags & PF_PKT) {
                                pti->pt_send |= TIOCPKT_IOCTL;

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

                        }
                        tp->t_lflag |= EXTPROC;
                } else {
                        if ((tp->t_state & EXTPROC) &&
                            (pti->pt_flags & PF_PKT)) {
                                pti->pt_send |= TIOCPKT_IOCTL;
                        }
                        tp->t_lflag |= EXTPROC;
                } else {
                        if ((tp->t_state & EXTPROC) &&
                            (pti->pt_flags & PF_PKT)) {
                                pti->pt_send |= TIOCPKT_IOCTL;

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

                        }
                        tp->t_lflag &= ~EXTPROC;
                }
                        }
                        tp->t_lflag &= ~EXTPROC;
                }


@@ -623,21 +655,19 @@ ptyioctl(dev, cmd, data, flag)
                        ttyflush(tp, FREAD|FWRITE);
                        return (0);
 
                        ttyflush(tp, FREAD|FWRITE);
                        return (0);
 

+#ifdef COMPAT_43

                case FIONREAD:
                        *(int *)data = tp->t_outq.c_cc;
                        return (0);
 
                case TIOCSETP:          
                case TIOCSETN:
                case FIONREAD:
                        *(int *)data = tp->t_outq.c_cc;
                        return (0);
 
                case TIOCSETP:          
                case TIOCSETN:

+#endif

                case TIOCSETD:
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:
                case TIOCSETD:
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:

-               case JUNK_TIOCSETAS:    /* XXX */
-               case JUNK_TIOCSETAWS:   /* XXX */
-               case JUNK_TIOCSETAFS:   /* XXX */
-                       while (getc(&tp->t_outq) >= 0)
-                               ;
+                       ndflush(&tp->t_outq, tp->t_outq.c_cc);

                        break;
 
                case TIOCSIG:
                        break;
 
                case TIOCSIG:


@@ -714,29 +744,9 @@ ptyioctl(dev, cmd, data, flag)
        }
 
  doioctl:
        }
 
  doioctl:

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

        if (error < 0)
                 error = ttioctl(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
-        * the queues.  We can't tell anything about the discipline
-        * from here...
-        *
-        * Nb: this is not really good enough, the line disc open routine
-        * may have done anything at all, no guarantees that close
-        * will fix it.  This also has the effect of losing the
-        * previous discipline, which an error on a TIOCSETD shouldn't
-        * do...  Sometime it should be done via an explicit check
-        * for TIOCSETD, then check to see what linesw[new_number].l_rint
-        * really is.
-        */
-       if (linesw[tp->t_line].l_rint != ttyinput) {
-               (*linesw[tp->t_line].l_close)(tp);
-               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 &&
 
        if (error < 0) {
                if (pti->pt_flags & PF_UCNTL &&


@@ -757,12 +767,11 @@ ptyioctl(dev, cmd, data, flag)
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:

-               case JUNK_TIOCSETAS:    /* XXX */
-               case JUNK_TIOCSETAWS:   /* XXX */
-               case JUNK_TIOCSETAFS:   /* XXX */
+#ifdef COMPAT_43

                case TIOCSETP:
                case TIOCSETN:
                case TIOCSETP:
                case TIOCSETN:

-#ifdef COMPAT_43
+#endif
+#if defined(COMPAT_43) || defined(COMPAT_SUNOS)

                case TIOCSETC:
                case TIOCSLTC:
                case TIOCLBIS:
                case TIOCSETC:
                case TIOCSLTC:
                case TIOCLBIS:


@@ -770,6 +779,7 @@ ptyioctl(dev, cmd, data, flag)
                case TIOCLSET:
 #endif
                        pti->pt_send |= TIOCPKT_IOCTL;
                case TIOCLSET:
 #endif
                        pti->pt_send |= TIOCPKT_IOCTL;

+                       ptcwakeup(tp, FREAD);

                default:
                        break;
                }
                default:
                        break;
                }


@@ -793,4 +803,3 @@ ptyioctl(dev, cmd, data, flag)
        }
        return (error);
 }
        }
        return (error);
 }

-#endif