diff options
Diffstat (limited to 'ext/pty/pty.c')
| -rw-r--r-- | ext/pty/pty.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index b18eb68f77..8a6994dea0 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -177,7 +177,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len) { int i = open("/dev/tty", O_RDONLY); if (i < 0) ERROR_EXIT("/dev/tty"); - rb_update_max_fd(i); + rb_fd_set_cloexec(i); if (ioctl(i, TIOCNOTTY, (char *)0)) ERROR_EXIT("ioctl(TIOCNOTTY)"); close(i); @@ -199,7 +199,7 @@ chfunc(void *data, char *errbuf, size_t errbuf_len) if (slave < 0) { ERROR_EXIT("open: pty slave"); } - rb_update_max_fd(slave); + rb_fd_set_cloexec(slave); close(master); #endif dup2(slave,0); @@ -291,7 +291,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, sigemptyset(&dfl.sa_mask); if ((masterfd = posix_openpt(O_RDWR|O_NOCTTY)) == -1) goto error; - rb_update_max_fd(masterfd); + rb_fd_set_cloexec(masterfd); if (sigaction(SIGCHLD, &dfl, &old) == -1) goto error; if (grantpt(masterfd) == -1) goto grantpt_error; if (sigaction(SIGCHLD, &old, NULL) == -1) goto error; @@ -299,7 +299,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if ((slavedevice = ptsname(masterfd)) == NULL) goto error; if (no_mesg(slavedevice, nomesg) == -1) goto error; if ((slavefd = open(slavedevice, O_RDWR|O_NOCTTY, 0)) == -1) goto error; - rb_update_max_fd(slavefd); + rb_fd_set_cloexec(slavefd); #if defined I_PUSH && !defined linux if (ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; @@ -331,8 +331,8 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if (!fail) return -1; rb_raise(rb_eRuntimeError, "openpty() failed"); } - rb_update_max_fd(*master); - rb_update_max_fd(*slave); + rb_fd_set_cloexec(*master); + rb_fd_set_cloexec(*slave); if (no_mesg(SlaveName, nomesg) == -1) { if (!fail) return -1; rb_raise(rb_eRuntimeError, "can't chmod slave pty"); @@ -348,11 +348,11 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if (!fail) return -1; rb_raise(rb_eRuntimeError, "_getpty() failed"); } - rb_update_max_fd(*master); + rb_fd_set_cloexec(*master); *slave = open(name, O_RDWR); /* error check? */ - rb_update_max_fd(*slave); + rb_fd_set_cloexec(*slave); strlcpy(SlaveName, name, DEVICELEN); return 0; @@ -366,7 +366,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, extern int grantpt(int); if((masterfd = open("/dev/ptmx", O_RDWR, 0)) == -1) goto error; - rb_update_max_fd(masterfd); + rb_fd_set_cloexec(masterfd); s = signal(SIGCHLD, SIG_DFL); if(grantpt(masterfd) == -1) goto error; signal(SIGCHLD, s); @@ -374,7 +374,7 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, if((slavedevice = ptsname(masterfd)) == NULL) goto error; if (no_mesg(slavedevice, nomesg) == -1) goto error; if((slavefd = open(slavedevice, O_RDWR, 0)) == -1) goto error; - rb_update_max_fd(slavefd); + rb_fd_set_cloexec(slavefd); #if defined I_PUSH && !defined linux if(ioctl(slavefd, I_PUSH, "ptem") == -1) goto error; if(ioctl(slavefd, I_PUSH, "ldterm") == -1) goto error; @@ -398,11 +398,11 @@ get_device_once(int *master, int *slave, char SlaveName[DEVICELEN], int nomesg, for (p = deviceNo; *p != NULL; p++) { snprintf(MasterName, sizeof MasterName, MasterDevice, *p); if ((masterfd = open(MasterName,O_RDWR,0)) >= 0) { - rb_update_max_fd(masterfd); + rb_fd_set_cloexec(masterfd); *master = masterfd; snprintf(SlaveName, DEVICELEN, SlaveDevice, *p); if ((slavefd = open(SlaveName,O_RDWR,0)) >= 0) { - rb_update_max_fd(slavefd); + rb_fd_set_cloexec(slavefd); *slave = slavefd; if (chown(SlaveName, getuid(), getgid()) != 0) goto error; if (chmod(SlaveName, nomesg ? 0600 : 0622) != 0) goto error; @@ -590,7 +590,7 @@ pty_getpty(int argc, VALUE *argv, VALUE self) wfptr->fd = dup(info.fd); if (wfptr->fd == -1) rb_sys_fail("dup()"); - rb_update_max_fd(wfptr->fd); + rb_fd_set_cloexec(wfptr->fd); wfptr->pathv = rfptr->pathv; res = rb_ary_new2(3); |