kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* io.c: sorry, wrong commit. orz

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20983 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2008-12-25 04:33:22 +00:00
parent f29ec7ed67
commit dea037cc67
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
io.c
View file

@ -4419,9 +4419,7 @@ popen_redirect(struct popen_arg *p)
} }
} }
} }
#endif
#if defined(HAVE_FORK) || defined(_WIN32)
void void
rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds) rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
{ {
@ -4438,16 +4436,12 @@ rb_close_before_exec(int lowfd, int maxhint, VALUE noclose_fds)
if (ret != -1 && !(ret & FD_CLOEXEC)) { if (ret != -1 && !(ret & FD_CLOEXEC)) {
fcntl(fd, F_SETFD, ret|FD_CLOEXEC); fcntl(fd, F_SETFD, ret|FD_CLOEXEC);
} }
#elif defined(_WIN32)
rb_w32_fd_noinherit(fd);
#else #else
close(fd); close(fd);
#endif #endif
} }
} }
#endif
#ifdef HAVE_FORK
static int static int
popen_exec(void *pp, char *errmsg, size_t errmsg_len) popen_exec(void *pp, char *errmsg, size_t errmsg_len)
{ {
@ -5931,15 +5925,13 @@ rb_io_initialize(int argc, VALUE *argv, VALUE io)
fd = NUM2INT(fnum); fd = NUM2INT(fnum);
UPDATE_MAXFD(fd); UPDATE_MAXFD(fd);
#if defined(HAVE_FCNTL) && defined(F_GETFL)
if (NIL_P(vmode)) { if (NIL_P(vmode)) {
#if defined(HAVE_FCNTL) && defined(F_GETFL)
oflags = fcntl(fd, F_GETFL); oflags = fcntl(fd, F_GETFL);
if (oflags == -1) rb_sys_fail(0); if (oflags == -1) rb_sys_fail(0);
fmode = rb_io_oflags_fmode(oflags); fmode = rb_io_oflags_fmode(oflags);
}
#elif defined(_WIN32)
if (rb_w32_is_valid_fd(fd)) rb_sys_fail(0);
#endif #endif
}
MakeOpenFile(io, fp); MakeOpenFile(io, fp);
fp->fd = fd; fp->fd = fd;
fp->mode = fmode; fp->mode = fmode;