* include/ruby/encoding.h (rb_econv_output): declared.

* transcode_data.h (rb_transcoder): add resetsize_func field.

* enc/trans/iso2022.trans (iso2022jp_reset_sequence_size): defined.
  (rb_EUC_JP_to_ISO_2022_JP): provede resetsize_func.

* tool/transcode-tblgen.rb: set NULL for resetsize_func.

* transcode.c (rb_econv_output): new function for inserting output.
  (output_replacement_character): use rb_econv_output.
  (transcode_loop): check return value of
  output_replacement_character.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18628 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 3 deletions

diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 7e188a0c1f..d7ad0d0237 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -230,11 +230,15 @@ typedef struct {
     rb_encoding *destination_encoding;
 } rb_econv_t;
 
-rb_econv_t *rb_econv_open(const char *from, const char *to, int flags);
+rb_econv_t *rb_econv_open(const char *source_encoding, const char *destination_encoding, int flags);
 rb_econv_result_t rb_econv_convert(rb_econv_t *ec,
-    const unsigned char **input_ptr, const unsigned char *input_stop,
-    unsigned char **output_ptr, unsigned char *output_stop,
+    const unsigned char **source_buffer_ptr, const unsigned char *source_buffer_end,
+    unsigned char **destination_buffer_ptr, unsigned char *destination_buffer_end,
     int flags);
+int rb_econv_output(rb_econv_t *ec,
+    const unsigned char *str, size_t len,
+    unsigned char **destination_buffer_ptr, unsigned char *destination_buffer_end,
+    size_t *required_size);
 void rb_econv_close(rb_econv_t *ec);
 
 /* flags for rb_econv_open */