summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-16 14:46:53 +0000
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-06-16 14:46:53 +0000
commitd3b852345a646f1058b40033c9f02e3d14c45ab6 (patch)
tree0e7c410a6ff6ad6f0c522287b255f9939e89ab9e /io.c
parente54f880643a91c9bb1dcecc5cec6b43254ef466d (diff)
* io.c (fptr_finalize): revert last change. [ruby-dev:38648]
* io.c (fptr_finalize): skip close(2) for fd 0,1,2. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/io.c b/io.c
index 7f3f6909ce..8f699747bc 100644
--- a/io.c
+++ b/io.c
@@ -3221,8 +3221,8 @@ fptr_finalize(rb_io_t *fptr, int noraise)
if (io_fflush(fptr) < 0 && NIL_P(err))
err = noraise ? Qtrue : INT2NUM(errno);
}
- if (noraise && (IS_PREP_STDIO(fptr) || fptr->fd <= 2)) {
- goto check_err;
+ if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
+ goto skip_fd_close;
}
if (fptr->stdio_file) {
/* fptr->stdio_file is deallocated anyway
@@ -3237,11 +3237,11 @@ fptr_finalize(rb_io_t *fptr, int noraise)
if (close(fptr->fd) < 0 && NIL_P(err))
err = noraise ? Qtrue : INT2NUM(errno);
}
+ skip_fd_close:
fptr->fd = -1;
fptr->stdio_file = 0;
fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
- check_err:
if (!NIL_P(err) && !noraise) {
switch(TYPE(err)) {
case T_FIXNUM: