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

* io.c (rb_io_external_encoding): should fill delayed

Browse Source 
initialization for STDIN.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-12-21 04:32:53 +00:00
parent 1b27cfcd6c
commit ad47716266
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -5,6 +5,9 @@ Fri Dec 21 13:10:57 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* encoding.c (rb_enc_from_encoding): returns Qnil for NULL * encoding.c (rb_enc_from_encoding): returns Qnil for NULL
encoding. encoding.
* io.c (rb_io_external_encoding): should fill delayed
initialization for STDIN.
Fri Dec 21 13:09:11 2007 Tanaka Akira <akr@fsij.org> Fri Dec 21 13:09:11 2007 Tanaka Akira <akr@fsij.org>
* encoding.c (rb_locale_charmap): return nil if no locale information. * encoding.c (rb_locale_charmap): return nil if no locale information.

3
io.c
View File

@ -5671,6 +5671,9 @@ rb_io_external_encoding(VALUE io)
rb_io_t *fptr; rb_io_t *fptr;
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
if (!fptr->enc && fptr->fd == 0) {
fptr->enc = rb_default_external_encoding();
}
return rb_enc_from_encoding(fptr->enc); return rb_enc_from_encoding(fptr->enc);
} }