must include proc before tty.h and socketvar.h

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

diff --git a/usr/src/sys/kern/tty_tty.c b/usr/src/sys/kern/tty_tty.c
index 3c1078d..9b26f68 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -1,75 +1,111 @@
-/*     tty_tty.c       4.5     82/01/13        */
+/*-
+ * Copyright (c) 1982, 1986, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * %sccs.include.redist.c%
+ *
+ *     @(#)tty_tty.c   7.17 (Berkeley) %G%
+ */

 
 /*
  * Indirect driver for controlling tty.
 
 /*
  * Indirect driver for controlling tty.

- *
- * THIS IS GARBAGE: MUST SOON BE DONE WITH struct inode * IN PROC TABLE.

  */
  */

-#include "../h/param.h"
-#include "../h/systm.h"
-#include "../h/conf.h"
-#include "../h/dir.h"
-#include "../h/user.h"
-#include "../h/tty.h"
-#include "../h/proc.h"
+#include "param.h"
+#include "systm.h"
+#include "conf.h"
+#include "ioctl.h"
+#include "proc.h"
+#include "tty.h"
+#include "vnode.h"
+#include "file.h"
+
+#define cttyvp(p) ((p)->p_flag&SCTTY ? (p)->p_session->s_ttyvp : NULL)

 
 /*ARGSUSED*/
 
 /*ARGSUSED*/

-syopen(dev, flag)
+cttyopen(dev, flag, mode, p)
+       dev_t dev;
+       int flag, mode;
+       struct proc *p;

 {
 {

+       struct vnode *ttyvp = cttyvp(p);
+       int error;

 
 

-       if(u.u_ttyp == NULL || (u.u_procp->p_flag&SDETACH)) {
-               u.u_error = ENXIO;
-               return;
-       }
-       (*cdevsw[major(u.u_ttyd)].d_open)(u.u_ttyd, flag);
+       if (ttyvp == NULL)
+               return (ENXIO);
+       VOP_LOCK(ttyvp);
+       error = VOP_ACCESS(ttyvp,
+         (flag&FREAD ? VREAD : 0) | (flag&FWRITE ? VWRITE : 0), p->p_ucred, p);
+       if (!error)
+               error = VOP_OPEN(ttyvp, flag, NOCRED, p);
+       VOP_UNLOCK(ttyvp);
+       return (error);

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

-syread(dev)
+cttyread(dev, uio, flag)
+       dev_t dev;
+       struct uio *uio;
+       int flag;

 {
 {

+       register struct vnode *ttyvp = cttyvp(uio->uio_procp);
+       int error;

 
 

-       if (u.u_ttyp == NULL || (u.u_procp->p_flag&SDETACH)) {
-               u.u_error = ENXIO;
-               return;
-       }
-       (*cdevsw[major(u.u_ttyd)].d_read)(u.u_ttyd);
+       if (ttyvp == NULL)
+               return (EIO);
+       VOP_LOCK(ttyvp);
+       error = VOP_READ(ttyvp, uio, flag, NOCRED);
+       VOP_UNLOCK(ttyvp);
+       return (error);

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

-sywrite(dev)
+cttywrite(dev, uio, flag)
+       dev_t dev;
+       struct uio *uio;
+       int flag;

 {
 {

+       register struct vnode *ttyvp = cttyvp(uio->uio_procp);
+       int error;

 
 

-       if (u.u_ttyp == NULL || (u.u_procp->p_flag&SDETACH)) {
-               u.u_error = ENXIO;
-               return;
-       }
-       (*cdevsw[major(u.u_ttyd)].d_write)(u.u_ttyd);
+       if (ttyvp == NULL)
+               return (EIO);
+       VOP_LOCK(ttyvp);
+       error = VOP_WRITE(ttyvp, uio, flag, NOCRED);
+       VOP_UNLOCK(ttyvp);
+       return (error);

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

-syioctl(dev, cmd, addr, flag)
-caddr_t addr;
+cttyioctl(dev, cmd, addr, flag, p)
+       dev_t dev;
+       int cmd;
+       caddr_t addr;
+       int flag;
+       struct proc *p;

 {
 {

+       struct vnode *ttyvp = cttyvp(p);

 
 

+       if (ttyvp == NULL)
+               return (EIO);

        if (cmd == TIOCNOTTY) {
        if (cmd == TIOCNOTTY) {

-               u.u_ttyp = 0;
-               u.u_ttyd = 0;
-               u.u_procp->p_pgrp = 0;
-               return;
-       }
-       if (u.u_ttyp == NULL || (u.u_procp->p_flag&SDETACH)) {
-               u.u_error = ENXIO;
-               return;
+               if (!SESS_LEADER(p)) {
+                       p->p_flag &= ~SCTTY;
+                       return (0);
+               } else
+                       return (EINVAL);

        }
        }

-       (*cdevsw[major(u.u_ttyd)].d_ioctl)(u.u_ttyd, cmd, addr, flag);
+       return (VOP_IOCTL(ttyvp, cmd, addr, flag, NOCRED, p));

 }
 
 }
 

-syselect(dev, flag)
+/*ARGSUSED*/
+cttyselect(dev, flag, p)
+       dev_t dev;
+       int flag;
+       struct proc *p;

 {
 {

+       struct vnode *ttyvp = cttyvp(p);

 
 

-       if (u.u_ttyp == NULL || (u.u_procp->p_flag&SDETACH)) {
-               u.u_error = ENXIO;
-               return (0);
-       }
-       return ((*cdevsw[major(u.u_ttyd)].d_select)(dev, flag));
+       if (ttyvp == NULL)
+               return (1);     /* try operation to get EOF/failure */
+       return (VOP_SELECT(ttyvp, flag, FREAD|FWRITE, NOCRED, p));

 }
 }