summaryrefslogtreecommitdiff
path: root/usr.bin/mail
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>1997-07-31 17:55:17 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>1997-07-31 17:55:17 +0000
commitac4b051e93db589311ab46f097ecc096d62972b3 (patch)
tree6cc07df6e8e19666c520dae8d26c91a5632797de /usr.bin/mail
parent7652c30ac89c8d83e419df4269324fe820d1debe (diff)
Remove TIOCEXT added in lite2 merge for now. Causes problems when
mail(1) is used over a telnet session.
Diffstat (limited to 'usr.bin/mail')
-rw-r--r--usr.bin/mail/tty.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/usr.bin/mail/tty.c b/usr.bin/mail/tty.c
index ee803eddf58..36b9bf29126 100644
--- a/usr.bin/mail/tty.c
+++ b/usr.bin/mail/tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.8 1997/07/30 06:32:41 millert Exp $ */
+/* $OpenBSD: tty.c,v 1.9 1997/07/31 17:55:16 millert Exp $ */
/* $NetBSD: tty.c,v 1.7 1997/07/09 05:25:46 mikel Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.2 (Berkeley) 4/20/95";
#else
-static char rcsid[] = "$OpenBSD: tty.c,v 1.8 1997/07/30 06:32:41 millert Exp $";
+static char rcsid[] = "$OpenBSD: tty.c,v 1.9 1997/07/31 17:55:16 millert Exp $";
#endif
#endif /* not lint */
@@ -73,8 +73,6 @@ grabh(hp, gflags)
sig_t saveint;
#ifndef TIOCSTI
sig_t savequit;
-#else
- int extproc, flag;
#endif
sig_t savetstp;
sig_t savettou;
@@ -82,9 +80,6 @@ grabh(hp, gflags)
int errs = 0;
#ifdef __GNUC__
/* Avoid siglongjmp clobbering */
-#ifdef TIOCSTI
- (void)&extproc;
-#endif
(void)&saveint;
(void)&errs;
#endif
@@ -110,14 +105,6 @@ grabh(hp, gflags)
if ((savequit = signal(SIGQUIT, SIG_IGN)) == SIG_DFL)
(void)signal(SIGQUIT, SIG_DFL);
#else
-# ifdef TIOCEXT
- extproc = ((ttybuf.c_lflag & EXTPROC) ? 1 : 0);
- if (extproc) {
- flag = 0;
- if (ioctl(fileno(stdin), TIOCEXT, &flag) < 0)
- warn("TIOCEXT: off");
- }
-# endif /* TIOCEXT */
if (sigsetjmp(intjmp, 1)) {
errs = SIGINT;
goto out;
@@ -165,14 +152,6 @@ out:
if (ttyset)
tcsetattr(fileno(stdin), TCSADRAIN, &ttybuf);
(void)signal(SIGQUIT, savequit);
-#else
-# ifdef TIOCEXT
- if (extproc) {
- flag = 1;
- if (ioctl(fileno(stdin), TIOCEXT, &flag) < 0)
- warn("TIOCEXT: on");
- }
-# endif /* TIOCEXT */
#endif
(void)signal(SIGINT, saveint);
return(errs);