summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2000-06-18 17:13:42 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2000-06-18 17:13:42 +0000
commit7d185a85d928d7e29d62aed7ee480b9b3aca27ab (patch)
tree84ca7dd2fa39e32261c69f0d33bc86e56ce1436e
parent70ccfb59c7c1086468a90f79b83241fcff6eb6cc (diff)
do not mess with tty's. makes EDITOR=ed cvs commit work over ssh2
-rw-r--r--usr.bin/ssh/aux.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/usr.bin/ssh/aux.c b/usr.bin/ssh/aux.c
index 899142da716..63f7dd41aa5 100644
--- a/usr.bin/ssh/aux.c
+++ b/usr.bin/ssh/aux.c
@@ -1,5 +1,5 @@
#include "includes.h"
-RCSID("$OpenBSD: aux.c,v 1.2 2000/05/17 09:47:59 markus Exp $");
+RCSID("$OpenBSD: aux.c,v 1.3 2000/06/18 17:13:41 markus Exp $");
#include "ssh.h"
@@ -22,6 +22,11 @@ void
set_nonblock(int fd)
{
int val;
+ if (isatty(fd)) {
+ /* do not mess with tty's */
+ debug("no set_nonblock for tty fd %d", fd);
+ return;
+ }
val = fcntl(fd, F_GETFL, 0);
if (val < 0) {
error("fcntl(%d, F_GETFL, 0): %s", fd, strerror(errno));