mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* io.c (io_reopen, rb_io_init_copy): should register fptr to pipe_list
when copying pipe fptr. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21495 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
84775721bc
commit
be551172ed
2 changed files with 13 additions and 0 deletions
|
@ -1,3 +1,8 @@
|
|||
Tue Jan 13 21:44:30 2009 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* io.c (io_reopen, rb_io_init_copy): should register fptr to pipe_list
|
||||
when copying pipe fptr.
|
||||
|
||||
Tue Jan 13 21:38:07 2009 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/socket/socket.c (rb_getaddrinfo): use getaddrinfo with GVL if
|
||||
|
|
8
io.c
8
io.c
|
@ -5259,6 +5259,10 @@ io_reopen(VALUE io, VALUE nfile)
|
|||
if (orig->pathv) fptr->pathv = orig->pathv;
|
||||
else fptr->pathv = Qnil;
|
||||
fptr->finalize = orig->finalize;
|
||||
#if defined (__CYGWIN__) || !defined(HAVE_FORK)
|
||||
if (fptr->finalize == pipe_finalize)
|
||||
pipe_add_fptr(fptr);
|
||||
#endif
|
||||
|
||||
fd = fptr->fd;
|
||||
fd2 = orig->fd;
|
||||
|
@ -5410,6 +5414,10 @@ rb_io_init_copy(VALUE dest, VALUE io)
|
|||
fptr->lineno = orig->lineno;
|
||||
if (!NIL_P(orig->pathv)) fptr->pathv = orig->pathv;
|
||||
fptr->finalize = orig->finalize;
|
||||
#if defined (__CYGWIN__) || !defined(HAVE_FORK)
|
||||
if (fptr->finalize == pipe_finalize)
|
||||
pipe_add_fptr(fptr);
|
||||
#endif
|
||||
|
||||
fd = ruby_dup(orig->fd);
|
||||
fptr->fd = fd;
|
||||
|
|
Loading…
Add table
Reference in a new issue