diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-08 08:26:00 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-11-08 08:26:00 +0000 |
| commit | 452bf3b9c954d770ccb704cb9f5470f515e00584 (patch) | |
| tree | 44f96379b5ef4e8ecd3e8bb6f29c96e4b7e6b2b1 /ext/pty | |
| parent | 53881a8c6dc2ca658244d8f12952b732f98dd737 (diff) | |
* ext/pty/pty.c (get_device_once): FreeBSD 8 supported O_CLOEXEC flag
for posix_openpt, but FreeBSD 9's posix_openpt doesn't support
O_CLOEXEC and fails if specified.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33668 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/pty')
| -rw-r--r-- | ext/pty/pty.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index fafc2c55dd..9527004f3a 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -291,19 +291,19 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, dfl.sa_flags = 0; sigemptyset(&dfl.sa_mask); -#if defined(__sun) +#if defined(__sun) || defined(__FreeBSD__) /* workaround for Solaris 10: grantpt() doesn't work if FD_CLOEXEC is set. [ruby-dev:44688] */ + /* FreeBSD 8 supported O_CLOEXEC for posix_openpt, but FreeBSD 9 removed it */ if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error; if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error; if (grantpt(masterfd) == -1) goto grantpt_error; rb_fd_fix_cloexec(masterfd); #else flags = O_RDWR|O_NOCTTY; -# if defined(O_CLOEXEC) && !defined(__FreeBSD__) +# if defined(O_CLOEXEC) /* glibc posix_openpt() in GNU/Linux calls open("/dev/ptmx", flags) internally. * So version dependency on GNU/Linux is same as O_CLOEXEC with open(). - * O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. - * FreeBSD's posix_openpt doesn't support O_CLOEXEC and fails if specified*/ + * O_CLOEXEC is available since Linux 2.6.23. Linux 2.6.18 silently ignore it. */ flags |= O_CLOEXEC; # endif if ((masterfd = posix_openpt(flags)) == -1) goto error; |