diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-02 02:25:11 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-07-02 02:25:11 +0000 |
| commit | 62a7c8fb13487b34dcc4c5531231bb5544584231 (patch) | |
| tree | 6ee4b3670ff1caedb935d2d7aeaf8966baed29ea /io.c | |
| parent | 034b25f79786e1914996d3792d04fa7db678c8f6 (diff) | |
* io.c (io_reopen): STDOUT.reopen(filename, "w+") didn't work.
(rb_io_reopen): STDOUT.reopen(File.open(filename, "w+")) didn't work.
This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10448 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
| -rw-r--r-- | io.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -3425,7 +3425,8 @@ io_reopen(VALUE io, VALUE nfile) if (fptr == orig) return io; #if !defined __CYGWIN__ if (IS_PREP_STDIO(fptr)) { - if ((fptr->mode & FMODE_READWRITE) != (orig->mode & FMODE_READWRITE)) { + if (((fptr->mode & FMODE_READWRITE) & (orig->mode & FMODE_READWRITE)) != + (fptr->mode & FMODE_READWRITE)) { rb_raise(rb_eArgError, "%s can't change access mode from \"%s\" to \"%s\"", PREP_STDIO_NAME(fptr), rb_io_flags_mode(fptr->mode), @@ -3536,7 +3537,8 @@ rb_io_reopen(int argc, VALUE *argv, VALUE file) if (!NIL_P(nmode)) { int flags = rb_io_mode_flags(StringValuePtr(nmode)); if (IS_PREP_STDIO(fptr) && - (fptr->mode & FMODE_READWRITE) != (flags & FMODE_READWRITE)) { + ((fptr->mode & FMODE_READWRITE) & (flags & FMODE_READWRITE)) != + (fptr->mode & FMODE_READWRITE)) { rb_raise(rb_eArgError, "%s can't change access mode from \"%s\" to \"%s\"", PREP_STDIO_NAME(fptr), rb_io_flags_mode(fptr->mode), |