From a788a2e53138ca6ca85e0c09b7945c18721040cf Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 7 Sep 2008 03:45:12 +0000 Subject: * io.c (make_writeconv): choose ASCII compatible encoding as intermediate encoding if stateful encoder exists. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ io.c | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 24396be89f..77de182d30 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Sep 7 12:44:26 2008 Tanaka Akira + + * io.c (make_writeconv): choose ASCII compatible encoding as + intermediate encoding if stateful encoder exists. + Sun Sep 7 12:09:29 2008 Tanaka Akira * include/ruby/encoding.h (ECONV_XML_ATTR_CONTENT_ENCODER): defined. diff --git a/io.c b/io.c index 5c43a062de..b7a5314983 100644 --- a/io.c +++ b/io.c @@ -729,6 +729,14 @@ make_writeconv(rb_io_t *fptr) denc = enc->name; fptr->writeconv_stateless = rb_str_new2(senc); } + else if ((fptr->encs.ecflags & ECONV_STATEFUL_ENCODER_MASK) && !rb_enc_asciicompat(enc)) { + /* xxx: stateful encoder works for ASCII compatible encoding. + * So we need to choose an encoding which is ASCII compatible and superset of enc. + * For encodings which is superset of UTF-8, UTF-8 is not appropriate choice. */ + senc = "UTF-8"; + denc = enc->name; + fptr->writeconv_stateless = rb_str_new2("UTF-8"); + } else { senc = denc = ""; fptr->writeconv_stateless = rb_str_new2(enc->name); -- cgit v1.2.3