projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Utterly hideous new approach to extracting install-sh from the
[u/mdw/putty]
/
unix
/
uxpty.c
diff --git
a/unix/uxpty.c
b/unix/uxpty.c
index
708e82d
..
ca7e98a
100644
(file)
--- a/
unix/uxpty.c
+++ b/
unix/uxpty.c
@@
-360,8
+360,10
@@
static void pty_open_master(Pty pty)
/*
* Set the pty master into non-blocking mode.
*/
/*
* Set the pty master into non-blocking mode.
*/
- int i = 1;
- ioctl(pty->master_fd, FIONBIO, &i);
+ int fl;
+ fl = fcntl(pty->master_fd, F_GETFL);
+ if (fl != -1 && !(fl & O_NONBLOCK))
+ fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK);
}
if (!ptys_by_fd)
}
if (!ptys_by_fd)
@@
-1085,5
+1087,7
@@
Backend pty_backend = {
pty_provide_logctx,
pty_unthrottle,
pty_cfg_info,
pty_provide_logctx,
pty_unthrottle,
pty_cfg_info,
- 1
+ "pty",
+ -1,
+ 0
};
};