diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2018-06-16 13:55:04 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2018-06-16 13:55:04 +0000 |
| commit | 0a555aacecd6c598301c0094ec28b8a3dca9f18c (patch) | |
| tree | 65c14e1da5539fc8b5b4e2ebffd8a0752619c72b | |
| parent | af6f4a4afb830425725a1f5dd61576667c921ee8 (diff) | |
base and ports are now clean of TIOCSTI uses. The #define can now be removed.
The code was already changed to return EIO, it will now return ENOTTY since
the code is deleted.
ok sthen
| -rw-r--r-- | sys/kern/tty.c | 5 | ||||
| -rw-r--r-- | sys/sys/ttycom.h | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c index d62a91e5263..3c380146368 100644 --- a/sys/kern/tty.c +++ b/sys/kern/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.140 2018/05/02 02:24:56 visa Exp $ */ +/* $OpenBSD: tty.c,v 1.141 2018/06/16 13:55:03 deraadt Exp $ */ /* $NetBSD: tty.c,v 1.68.4.2 1996/06/06 16:04:52 thorpej Exp $ */ /*- @@ -960,9 +960,6 @@ ttioctl(struct tty *tp, u_long cmd, caddr_t data, int flag, struct proc *p) } splx(s); break; - case TIOCSTI: /* simulate terminal input */ - return (EIO); - break; case TIOCSTOP: /* stop output, like ^S */ s = spltty(); if (!ISSET(tp->t_state, TS_TTSTOP)) { diff --git a/sys/sys/ttycom.h b/sys/sys/ttycom.h index cee568d4ec1..82af7e8fba7 100644 --- a/sys/sys/ttycom.h +++ b/sys/sys/ttycom.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ttycom.h,v 1.16 2018/01/08 11:52:14 mpi Exp $ */ +/* $OpenBSD: ttycom.h,v 1.17 2018/06/16 13:55:03 deraadt Exp $ */ /* $NetBSD: ttycom.h,v 1.4 1996/05/19 17:17:53 jonathan Exp $ */ /*- @@ -95,7 +95,6 @@ struct tstamps { #define TIOCSPGRP _IOW('t', 118, int) /* set pgrp of tty */ /* 117-116 compat */ #define TIOCOUTQ _IOR('t', 115, int) /* output queue size */ -#define TIOCSTI _IOW('t', 114, char) /* simulate terminal input */ #define TIOCNOTTY _IO('t', 113) /* void tty association */ #define TIOCPKT _IOW('t', 112, int) /* pty: set/clear packet mode */ #define TIOCPKT_DATA 0x00 /* data packet */ |