From fcc86b0f4c443b7ab28fb61831b81767a8798292 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 31 May 2011 16:15:15 +0000 Subject: * io.c (io_encoding_set): should honor already set ecflags since it might be set by mode option. fixed #4804 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31872 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 8 +++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2538a5763..b80c4a5e48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Jun 1 01:15:12 2011 Nobuyoshi Nakada + + * io.c (io_encoding_set): should honor already set ecflags since it + might be set by mode option. fixed #4804 + Wed Jun 1 00:34:04 2011 CHIKANAGA Tomoyuki * ext/bigdecimal/bigdecimal.c (GetVpValueWithPrec): remove unused diff --git a/io.c b/io.c index 3bfdfc1d95..832e047d9a 100644 --- a/io.c +++ b/io.c @@ -7959,7 +7959,7 @@ static void io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt) { rb_encoding *enc, *enc2; - int ecflags; + int ecflags = fptr->encs.ecflags; VALUE ecopts, tmp; if (!NIL_P(v2)) { @@ -7980,24 +7980,22 @@ io_encoding_set(rb_io_t *fptr, VALUE v1, VALUE v2, VALUE opt) } else enc = rb_to_encoding(v2); - ecflags = rb_econv_prepare_opts(opt, &ecopts); + ecflags = rb_econv_prepare_options(opt, &ecopts, ecflags); } else { if (NIL_P(v1)) { /* Set to default encodings */ rb_io_ext_int_to_encs(NULL, NULL, &enc, &enc2); - ecflags = 0; ecopts = Qnil; } else { tmp = rb_check_string_type(v1); if (!NIL_P(tmp) && rb_enc_asciicompat(rb_enc_get(tmp))) { parse_mode_enc(RSTRING_PTR(tmp), &enc, &enc2, NULL); - ecflags = rb_econv_prepare_opts(opt, &ecopts); + ecflags = rb_econv_prepare_options(opt, &ecopts, ecflags); } else { rb_io_ext_int_to_encs(rb_to_encoding(v1), NULL, &enc, &enc2); - ecflags = 0; ecopts = Qnil; } } -- cgit v1.2.3