mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/pty/pty.c (HAVE_SYS_IOCTL_H): already defined at config.h, so
use it. * ext/pty/pty.c (establishShell): should close descriptors if fork failed. (ruby-bugs:PR#1211) based on gotoyuzo's patch. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3db654d88a
commit
e5d803e671
2 changed files with 11 additions and 1 deletions
|
@ -1,3 +1,11 @@
|
||||||
|
Wed Dec 10 14:45:39 2003 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||||
|
|
||||||
|
* ext/pty/pty.c (HAVE_SYS_IOCTL_H): already defined at config.h, so
|
||||||
|
use it.
|
||||||
|
|
||||||
|
* ext/pty/pty.c (establishShell): should close descriptors if fork
|
||||||
|
failed. (ruby-bugs:PR#1211) based on gotoyuzo's patch.
|
||||||
|
|
||||||
Wed Dec 10 12:53:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
|
Wed Dec 10 12:53:05 2003 WATANABE Hirofumi <eban@ruby-lang.org>
|
||||||
|
|
||||||
* win32/win32.h: define execv() using do_aspawn().
|
* win32/win32.h: define execv() using do_aspawn().
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
#include <fcntl.h>
|
#include <fcntl.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <pwd.h>
|
#include <pwd.h>
|
||||||
#if !defined(HAVE_OPENPTY) && !defined(HAVE__GETPTY)
|
#ifdef HAVE_SYS_IOCTL_H
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_LIBUTIL_H
|
#ifdef HAVE_LIBUTIL_H
|
||||||
|
@ -229,6 +229,8 @@ establishShell(argc, argv, info)
|
||||||
info->thread = rb_thread_current();
|
info->thread = rb_thread_current();
|
||||||
currentPid = getpid();
|
currentPid = getpid();
|
||||||
if((i = fork()) < 0) {
|
if((i = fork()) < 0) {
|
||||||
|
close(master);
|
||||||
|
close(slave);
|
||||||
rb_sys_fail("fork failed");
|
rb_sys_fail("fork failed");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue