summaryrefslogtreecommitdiffstats
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 15:39:00 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-06 15:39:00 +0000
commit2539f7c002cdcff341745effe114aaa5532d3f7a (patch)
tree1fdb105da4cba337d3aa41ba2452436506a4490b /io.c
parent3f4ef8222021363eac56f02f7ccd12fb8b551294 (diff)
downloadruby-2539f7c002cdcff341745effe114aaa5532d3f7a.tar.gz
ruby-2539f7c002cdcff341745effe114aaa5532d3f7a.tar.xz
ruby-2539f7c002cdcff341745effe114aaa5532d3f7a.zip
* include/ruby/encoding.h (ECONV_ERROR_HANDLER_MASK): defined.
(ECONV_DECODER_MASK): defined. (ECONV_ENCODER_MASK): defined. * io.c (make_writeconv): restrict ecflags for writeconv with ECONV_ERROR_HANDLER_MASK. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19193 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/io.c b/io.c
index 88217efe0..ac7c1f16b 100644
--- a/io.c
+++ b/io.c
@@ -716,6 +716,7 @@ make_writeconv(rb_io_t *fptr)
if (NEED_NEWLINE_ENCODER(fptr))
fptr->writeconv_pre_ecflags |= TEXTMODE_NEWLINE_ENCODER;
#endif
+ ecflags &= ECONV_ERROR_HANDLER_MASK;
enc = fptr->encs.enc2 ? fptr->encs.enc2 : fptr->encs.enc;
senc = rb_econv_stateless_encoding(enc->name);