From 9bc459b96fb5c4e518b131c32b798c27eb894de1 Mon Sep 17 00:00:00 2001 From: matz Date: Fri, 21 Dec 2007 04:32:53 +0000 Subject: * io.c (rb_io_external_encoding): should fill delayed initialization for STDIN. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14398 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 3 +++ io.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index f879970fc..70b08e017 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ Fri Dec 21 13:10:57 2007 Yukihiro Matsumoto * encoding.c (rb_enc_from_encoding): returns Qnil for NULL encoding. + * io.c (rb_io_external_encoding): should fill delayed + initialization for STDIN. + Fri Dec 21 13:09:11 2007 Tanaka Akira * encoding.c (rb_locale_charmap): return nil if no locale information. diff --git a/io.c b/io.c index 6947987ee..b03dac5e9 100644 --- a/io.c +++ b/io.c @@ -5671,6 +5671,9 @@ rb_io_external_encoding(VALUE io) rb_io_t *fptr; GetOpenFile(io, fptr); + if (!fptr->enc && fptr->fd == 0) { + fptr->enc = rb_default_external_encoding(); + } return rb_enc_from_encoding(fptr->enc); } -- cgit