~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch from Colin Watson intended to give a clean Unix compile with GCC 4.
[sgt/putty]
/
unix
/
uxpty.c
diff --git
a/unix/uxpty.c
b/unix/uxpty.c
index
e47f798
..
cc01a67
100644
(file)
--- a/
unix/uxpty.c
+++ b/
unix/uxpty.c
@@
-277,7
+277,7
@@
static int pty_open_slave(Pty pty)
{
if (pty->slave_fd < 0) {
pty->slave_fd = open(pty->name, O_RDWR);
{
if (pty->slave_fd < 0) {
pty->slave_fd = open(pty->name, O_RDWR);
-
fcntl(pty->slave_fd, F_SETFD, FD_CLOEXEC
);
+
cloexec(pty->slave_fd
);
}
return pty->slave_fd;
}
return pty->slave_fd;
@@
-309,7
+309,7
@@
static void pty_open_master(Pty pty)
strcpy(pty->name, master_name);
pty->name[5] = 't'; /* /dev/ptyXX -> /dev/ttyXX */
strcpy(pty->name, master_name);
pty->name[5] = 't'; /* /dev/ptyXX -> /dev/ttyXX */
-
fcntl(pty->master_fd, F_SETFD, FD_CLOEXEC
);
+
cloexec(pty->master_fd
);
if (pty_open_slave(pty) >= 0 &&
access(pty->name, R_OK | W_OK) == 0)
if (pty_open_slave(pty) >= 0 &&
access(pty->name, R_OK | W_OK) == 0)
@@
-350,7
+350,7
@@
static void pty_open_master(Pty pty)
exit(1);
}
exit(1);
}
-
fcntl(pty->master_fd, F_SETFD, FD_CLOEXEC
);
+
cloexec(pty->master_fd
);
pty->name[FILENAME_MAX-1] = '\0';
strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);
pty->name[FILENAME_MAX-1] = '\0';
strncpy(pty->name, ptsname(pty->master_fd), FILENAME_MAX-1);