add support for kernel profiling; add sysctl_struct; eliminate trailing blanks

[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 6570510..37f7ad5 100644 (file)
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -4,20 +4,20 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)tty_tty.c   7.14 (Berkeley) %G%
+ *     @(#)tty_tty.c   7.20 (Berkeley) %G%

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

-#include "param.h"
-#include "systm.h"
-#include "conf.h"
-#include "ioctl.h"
-#include "tty.h"
-#include "proc.h"
-#include "vnode.h"
-#include "file.h"
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/conf.h>
+#include <sys/ioctl.h>
+#include <sys/proc.h>
+#include <sys/tty.h>
+#include <sys/vnode.h>
+#include <sys/file.h>

 
 #define cttyvp(p) ((p)->p_flag&SCTTY ? (p)->p_session->s_ttyvp : NULL)
 
 
 #define cttyvp(p) ((p)->p_flag&SCTTY ? (p)->p_session->s_ttyvp : NULL)
 


@@ -35,16 +35,17 @@ 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*/
 cttyread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 }
 
 /*ARGSUSED*/
 cttyread(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

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


@@ -61,6 +62,7 @@ cttyread(dev, uio, flag)
 cttywrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;
 cttywrite(dev, uio, flag)
        dev_t dev;
        struct uio *uio;

+       int flag;

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