diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 10:54:59 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-06 10:54:59 +0000 |
| commit | f88c9f03f7c00402558f5b47331774b8b65fbaaa (patch) | |
| tree | fef6a8df2f981a75d8a70701ccd8fb1bac4fb7ee /transcode.c | |
| parent | 683eec7a5db10feeaef8aa1968f4d54af4fcfa9c (diff) | |
* transcode.c (rb_econv_open): fix last_tc.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19186 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
| -rw-r--r-- | transcode.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/transcode.c b/transcode.c index a0bac4f9d5..e2ea56a3ba 100644 --- a/transcode.c +++ b/transcode.c @@ -880,7 +880,6 @@ rb_econv_open(const char *sname, const char *dname, int ecflags) transcoder_entry_t **entries = NULL; int num_trans; static rb_econv_t *ec; - int universal_newline_decoder_added = 0; rb_encoding *senc, *denc; int sidx, didx; @@ -977,9 +976,9 @@ rb_econv_open(const char *sname, const char *dname, int ecflags) ec->last_tc = NULL; ec->last_trans_index = -1; } - else if (universal_newline_decoder_added) { - ec->last_tc = ec->elems[ec->num_trans-2].tc; - ec->last_trans_index = ec->num_trans-2; + else { + ec->last_trans_index = ec->num_trans-1-num_decoders; + ec->last_tc = ec->elems[ec->last_trans_index].tc; } return ec; |