projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Restore the configure check for GTK 1, which I accidentally removed
[u/mdw/putty]
/
unix
/
uxpty.c
diff --git
a/unix/uxpty.c
b/unix/uxpty.c
index
2e165cf
..
5de43a3
100644
(file)
--- a/
unix/uxpty.c
+++ b/
unix/uxpty.c
@@
-260,7
+260,8
@@
static void cleanup_utmp(void)
static void sigchld_handler(int signum)
{
static void sigchld_handler(int signum)
{
- write(pty_signal_pipe[1], "x", 1);
+ if (write(pty_signal_pipe[1], "x", 1) <= 0)
+ /* not much we can do about it */;
}
#ifndef OMIT_UTMP
}
#ifndef OMIT_UTMP
@@
-360,8
+361,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)
@@
-631,7
+634,9
@@
int pty_select_result(int fd, int event)
int status;
char c[1];
int status;
char c[1];
- read(pty_signal_pipe[0], c, 1); /* ignore its value; it'll be `x' */
+ if (read(pty_signal_pipe[0], c, 1) <= 0)
+ /* ignore error */;
+ /* ignore its value; it'll be `x' */
do {
pid = waitpid(-1, &status, WNOHANG);
do {
pid = waitpid(-1, &status, WNOHANG);
@@
-1087,5
+1092,5
@@
Backend pty_backend = {
pty_cfg_info,
"pty",
-1,
pty_cfg_info,
"pty",
-1,
- 1
+ 0
};
};