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

* io.c (argf_set_encoding): uses current_file after check for next

Browse Source 
input.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-02-21 05:47:12 +00:00
parent 3ce61d2a63
commit 7f2ca5ba7a
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Feb 21 14:47:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (argf_set_encoding): uses current_file after check for next
input.
Thu Feb 21 11:10:49 2008 NARUSE, Yui <naruse@ruby-lang.org> Thu Feb 21 11:10:49 2008 NARUSE, Yui <naruse@ruby-lang.org>
* string.c: replace rb_enc_copy by rb_enc_cr_str_copy or * string.c: replace rb_enc_copy by rb_enc_cr_str_copy or

4
bootstraptest/test_io.rb
View File

@ -69,3 +69,7 @@ assert_equal 'ok', %q{
File.unlink(tmpname) File.unlink(tmpname)
:ok :ok
} }
assert_normal_exit %q{
ARGF.set_encoding "foo"
}

4
bootstraptest/test_knownbug.rb
View File

@ -57,7 +57,3 @@ assert_normal_exit %q{
assert_normal_exit %q{ assert_normal_exit %q{
"".center(1, "\x80".force_encoding("utf-8")) "".center(1, "\x80".force_encoding("utf-8"))
}, '[ruby-dev:33807]' }, '[ruby-dev:33807]'
assert_normal_exit %q{
ARGF.set_encoding "foo"
}

5
io.c
View File

@ -6103,8 +6103,11 @@ argf_set_encoding(int argc, VALUE *argv, VALUE io)
{ {
rb_io_t *fptr; rb_io_t *fptr;
if (next_argv()) {
rb_raise(rb_eArgError, "no stream to set encoding");
}
rb_io_set_encoding(argc, argv, current_file); rb_io_set_encoding(argc, argv, current_file);
GetOpenFile(io, fptr); GetOpenFile(current_file, fptr);
argf_enc = fptr->enc; argf_enc = fptr->enc;
argf_enc2 = fptr->enc2; argf_enc2 = fptr->enc2;
return io; return io;