diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 17:38:32 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-23 17:38:32 +0000 |
commit | 5f9748deb7b934d3ba150ea3184cb1006a7dc9fd (patch) | |
tree | 490005fc0bab196500f0c75d01b30364c9cd3d1a /io.c | |
parent | 7e237b9813192265ee25bc43406c772ce65ff5ad (diff) | |
download | ruby-5f9748deb7b934d3ba150ea3184cb1006a7dc9fd.tar.gz |
* io.c (rb_io_external_encoding): should return the encoding of
the file reading.
* io.c (rb_io_internal_encoding): should return the encoding of
read string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -5848,6 +5848,9 @@ rb_io_external_encoding(VALUE io) rb_io_t *fptr; GetOpenFile(io, fptr); + if (fptr->enc2) { + return rb_enc_from_encoding(fptr->enc2); + } if (!fptr->enc && fptr->fd == 0) { fptr->enc = rb_default_external_encoding(); } @@ -5869,7 +5872,7 @@ rb_io_internal_encoding(VALUE io) GetOpenFile(io, fptr); if (!fptr->enc2) return Qnil; - return rb_enc_from_encoding(fptr->enc2); + return rb_enc_from_encoding(fptr->enc); } static VALUE |