X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/blobdiff_plain/35c1dcdb20ecc9953e58823e685749d54aaaf51e..943685687a914f34bb028d07fefeff4a802b6d5b:/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 d61c007d66..05acb8804a 100644
--- a/usr/src/sys/kern/tty_tty.c
+++ b/usr/src/sys/kern/tty_tty.c
@@ -1,49 +1,51 @@
-/*	tty_tty.c	4.7	82/01/24	*/
+/*	tty_tty.c	6.2	84/08/29	*/
 
 /*
  * 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 "dir.h"
+#include "user.h"
+#include "ioctl.h"
+#include "tty.h"
+#include "proc.h"
+#include "uio.h"
 
 /*ARGSUSED*/
 syopen(dev, flag)
+	dev_t dev;
+	int flag;
 {
 
-	if (u.u_ttyp == NULL) {
-		u.u_error = ENXIO;
-		return;
-	}
-	(*cdevsw[major(u.u_ttyd)].d_open)(u.u_ttyd, flag);
+	if (u.u_ttyp == NULL)
+		return (ENXIO);
+	return ((*cdevsw[major(u.u_ttyd)].d_open)(u.u_ttyd, flag));
 }
 
 /*ARGSUSED*/
-syread(dev)
+syread(dev, uio)
+	dev_t dev;
+	struct uio *uio;
 {
 
-	if (u.u_ttyp == NULL) {
-		u.u_error = ENXIO;
-		return;
-	}
-	(*cdevsw[major(u.u_ttyd)].d_read)(u.u_ttyd);
+	if (u.u_ttyp == NULL)
+		return (ENXIO);
+	return ((*cdevsw[major(u.u_ttyd)].d_read)(u.u_ttyd, uio));
 }
 
 /*ARGSUSED*/
-sywrite(dev)
+sywrite(dev, uio)
+	dev_t dev;
+	struct uio *uio;
 {
 
-	if (u.u_ttyp == NULL) {
-		u.u_error = ENXIO;
-		return;
-	}
-	(*cdevsw[major(u.u_ttyd)].d_write)(u.u_ttyd);
+	if (u.u_ttyp == NULL)
+		return (ENXIO);
+	return ((*cdevsw[major(u.u_ttyd)].d_write)(u.u_ttyd, uio));
 }
 
 /*ARGSUSED*/
@@ -58,22 +60,22 @@ syioctl(dev, cmd, addr, flag)
 		u.u_ttyp = 0;
 		u.u_ttyd = 0;
 		u.u_procp->p_pgrp = 0;
-		u.u_procp->p_flags &= ~SDETACH;
-		return;
-	}
-	if (u.u_ttyp == NULL) {
-		u.u_error = ENXIO;
-		return;
+		return (0);
 	}
-	(*cdevsw[major(u.u_ttyd)].d_ioctl)(u.u_ttyd, cmd, addr, flag);
+	if (u.u_ttyp == NULL)
+		return (ENXIO);
+	return ((*cdevsw[major(u.u_ttyd)].d_ioctl)(u.u_ttyd, cmd, addr, flag));
 }
 
+/*ARGSUSED*/
 syselect(dev, flag)
+	dev_t dev;
+	int flag;
 {
 
 	if (u.u_ttyp == NULL) {
 		u.u_error = ENXIO;
 		return (0);
 	}
-	return ((*cdevsw[major(u.u_ttyd)].d_select)(dev, flag));
+	return ((*cdevsw[major(u.u_ttyd)].d_select)(u.u_ttyd, flag));
 }