1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_io_external_encoding): should return nil for

Browse Source 
pass-through write IO.  [ruby-dev:32740]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-25 06:44:58 +00:00
parent 9f98c9a9c2
commit 72bf77fb30
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Tue Dec 25 15:42:49 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* io.c (rb_io_external_encoding): should return nil for
pass-through write IO. [ruby-dev:32740]
Tue Dec 25 15:24:57 2007 Tanaka Akira <akr@fsij.org> Tue Dec 25 15:24:57 2007 Tanaka Akira <akr@fsij.org>
* io.c (appendline): initialize rslen to 1 if rsptr is 0. * io.c (appendline): initialize rslen to 1 if rsptr is 0.

6
io.c
View File

@ -5921,6 +5921,7 @@ rb_io_s_read(int argc, VALUE *argv, VALUE io)
* io.external_encoding => encoding * io.external_encoding => encoding
* *
* Returns the Encoding object that represents the encoding of the file. * Returns the Encoding object that represents the encoding of the file.
* If io is write mode and no encoding is specified, returns <code>nil</code>.
*/ */
static VALUE static VALUE
@ -5935,6 +5936,11 @@ rb_io_external_encoding(VALUE io)
if (!fptr->enc && fptr->fd == 0) { if (!fptr->enc && fptr->fd == 0) {
fptr->enc = rb_default_external_encoding(); fptr->enc = rb_default_external_encoding();
} }
if (fptr->mode & FMODE_WRITABLE) {
if (fptr->enc)
return rb_enc_from_encoding(fptr->enc);
return Qnil;
}
return rb_enc_from_encoding(io_read_encoding(fptr)); return rb_enc_from_encoding(io_read_encoding(fptr));
} }