BSD 4_3_Net_2 release

[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 8523b82..4a0bed3 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -1,9 +1,36 @@
-/*
- * Copyright (c) 1982, 1986 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, 1991 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * 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_tty.c   7.12 (Berkeley) %G%
+ *     @(#)tty_tty.c   7.15 (Berkeley) 5/28/91

  */
 
 /*
  */
 
 /*


@@ -34,19 +61,18 @@ cttyopen(dev, flag, mode, p)
        VOP_LOCK(ttyvp);
        error = VOP_ACCESS(ttyvp,
          (flag&FREAD ? VREAD : 0) | (flag&FWRITE ? VWRITE : 0), p->p_ucred, p);
        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);
        VOP_UNLOCK(ttyvp);

-       if (error)
-               return (error);
-       return (VOP_OPEN(ttyvp, flag, NOCRED, p));
+       return (error);

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

-cttyread(dev, uio, flag, p)
+cttyread(dev, uio, flag)

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

-       struct proc *p;

 {
 {

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

        int error;
 
        if (ttyvp == NULL)
        int error;
 
        if (ttyvp == NULL)


@@ -58,12 +84,11 @@ cttyread(dev, uio, flag, p)
 }
 
 /*ARGSUSED*/
 }
 
 /*ARGSUSED*/

-cttywrite(dev, uio, flag, p)
+cttywrite(dev, uio, flag)

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

-       struct proc *p;

 {
 {

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

        int error;
 
        if (ttyvp == NULL)
        int error;
 
        if (ttyvp == NULL)