u. is gone, pcb is at p_addr; aston => signotify

[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 fd97a11..714e9b8 100644 (file)
--- a/usr/src/sys/kern/tty_pty.c
+++ b/usr/src/sys/kern/tty_pty.c
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_pty.c   7.16 (Berkeley) %G%
+ *     @(#)tty_pty.c   7.19 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -18,7 +18,6 @@
 #include "systm.h"
 #include "ioctl.h"
 #include "tty.h"
 #include "systm.h"
 #include "ioctl.h"
 #include "tty.h"

-#include "user.h"

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


@@ -48,8 +47,6 @@ struct        pt_ioctl {
 } pt_ioctl[NPTY];
 int    npty = NPTY;            /* for pstat -t */
 
 } pt_ioctl[NPTY];
 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


@@ -65,8 +62,9 @@ int ptydebug = 0;
 #define        PF_OWAIT        0x1000          /* waiting for PF_BLOCK to clear */
 
 /*ARGSUSED*/
 #define        PF_OWAIT        0x1000          /* waiting for PF_BLOCK to clear */
 
 /*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;


@@ -86,7 +84,7 @@ 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;
                return (EBUSY);
        if (tp->t_oproc)                        /* Ctrlr still around. */
                tp->t_state |= TS_CARR_ON;


@@ -119,19 +117,20 @@ 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 (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);


@@ -220,15 +219,19 @@ ptcwakeup(tp, flag)
                        pti->pt_selw = 0;
                        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);

                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;


@@ -371,13 +374,14 @@ 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)
        int s;
 
        if ((tp->t_state&TS_CARR_ON) == 0)


@@ -403,10 +407,10 @@ 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)
+               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;
 
 
                break;
 
 


@@ -422,10 +426,10 @@ ptcselect(dev, rw)
                                    return (1);
                        }
                }
                                    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;
 
        }


@@ -437,10 +441,9 @@ ptcwrite(dev, uio, flag)
        register struct uio *uio;
 {
        register struct tty *tp = &pt_tty[minor(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;


@@ -451,18 +454,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);
+                               error = uiomove((caddr_t)cp, cc, uio);

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


@@ -470,7 +467,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);


@@ -478,17 +475,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);
+                       error = uiomove((caddr_t)cp, cc, uio);

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


@@ -501,7 +492,7 @@ again:
                                wakeup((caddr_t)&tp->t_rawq);
                                goto block;
                        }
                                wakeup((caddr_t)&tp->t_rawq);
                                goto block;
                        }

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

                        cnt++;
                        cc--;
                }
                        cnt++;
                        cc--;
                }


@@ -515,18 +506,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) || (flag & IO_NDELAY)) {
-               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 (error = tsleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI | PCATCH,
                if (cnt == 0)
                        return (EWOULDBLOCK);
                return (0);
        }
        if (error = tsleep((caddr_t)&tp->t_rawq.c_cf, TTOPRI | PCATCH,

-           ttyout, 0))
+           ttyout, 0)) {
+               /* adjust for data copied in but not written */
+               uio->uio_resid += cc;

                return (error);
                return (error);

+       }

        goto again;
 }
 
        goto again;
 }
 


@@ -635,13 +627,6 @@ 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 FIONREAD:
                        *(int *)data = tp->t_outq.c_cc;
                        return (0);
                case FIONREAD:
                        *(int *)data = tp->t_outq.c_cc;
                        return (0);


@@ -652,9 +637,6 @@ ptyioctl(dev, cmd, data, flag)
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:

-               case JUNK_TIOCSETAS:
-               case JUNK_TIOCSETAWS:
-               case JUNK_TIOCSETAFS:

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


@@ -752,7 +734,7 @@ ptyioctl(dev, cmd, data, flag)
         */
        if (linesw[tp->t_line].l_rint != ttyinput) {
                (*linesw[tp->t_line].l_close)(tp);
         */
        if (linesw[tp->t_line].l_rint != ttyinput) {
                (*linesw[tp->t_line].l_close)(tp);

-               tp->t_line = 0;
+               tp->t_line = TTYDISC;

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


@@ -776,9 +758,6 @@ ptyioctl(dev, cmd, data, flag)
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:
                case TIOCSETA:
                case TIOCSETAW:
                case TIOCSETAF:

-               case JUNK_TIOCSETAS:
-               case JUNK_TIOCSETAWS:
-               case JUNK_TIOCSETAFS:

                case TIOCSETP:
                case TIOCSETN:
 #ifdef COMPAT_43
                case TIOCSETP:
                case TIOCSETN:
 #ifdef COMPAT_43