~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a null-dereference introduced by another mis-fix in r9919.
[sgt/putty]
/
unix
/
uxpty.c
diff --git
a/unix/uxpty.c
b/unix/uxpty.c
index
4a606ef
..
fb1bd55
100644
(file)
--- a/
unix/uxpty.c
+++ b/
unix/uxpty.c
@@
-373,15
+373,7
@@
static void pty_open_master(Pty pty)
strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
#endif
strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
#endif
- {
- /*
- * Set the pty master into non-blocking mode.
- */
- int fl;
- fl = fcntl(pty->master_fd, F_GETFL);
- if (fl != -1 && !(fl & O_NONBLOCK))
- fcntl(pty->master_fd, F_SETFL, fl | O_NONBLOCK);
- }
+ nonblock(pty->master_fd);
if (!ptys_by_fd)
ptys_by_fd = newtree234(pty_compare_by_fd);
if (!ptys_by_fd)
ptys_by_fd = newtree234(pty_compare_by_fd);