diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-30 17:23:27 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-30 17:23:27 +0000 |
commit | 55ef60ddbd7ceddf9af1296c621bc3ab211bb05a (patch) | |
tree | 9bc632fd25e9391993462d320035031a992342f5 | |
parent | b822c8ae778834a3cd2c7b11181a97874e84b6a5 (diff) | |
download | ruby-55ef60ddbd7ceddf9af1296c621bc3ab211bb05a.tar.gz ruby-55ef60ddbd7ceddf9af1296c621bc3ab211bb05a.tar.xz ruby-55ef60ddbd7ceddf9af1296c621bc3ab211bb05a.zip |
* io.c (open_key_args): allow encoding key to take two encoding
names. a patch from <rubikitch AT ruby-lang.org>. [ruby-dev:33540]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Thu Jan 31 02:22:04 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * io.c (open_key_args): allow encoding key to take two encoding + names. a patch from <rubikitch AT ruby-lang.org>. [ruby-dev:33540] + Thu Jan 31 02:15:49 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (dsym): allow empty symbols. [ruby-core:15248] @@ -5853,7 +5853,7 @@ open_key_args(int argc, VALUE *argv, struct foreach_arg *arg) arg->io = rb_io_open(RSTRING_PTR(argv[0]), "r"); GetOpenFile(arg->io, fptr); - fptr->enc = rb_to_encoding(v); + mode_enc(fptr, StringValueCStr(v)); return; } } |