diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-25 15:58:35 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-25 15:58:35 +0000 |
commit | 1a805010ed9e9edc99f2abefa5d4431eb54b43f4 (patch) | |
tree | f188729ec5b69037d748051a45c018e62f2adbe8 /transcode.c | |
parent | 6c1190d10f4cb338595a39237e0126a8b677c8db (diff) | |
download | ruby-1a805010ed9e9edc99f2abefa5d4431eb54b43f4.tar.gz |
* transcode.c (str_transcode0): don't short cut for newline conversion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'transcode.c')
-rw-r--r-- | transcode.c | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/transcode.c b/transcode.c index 658a8769b8..40db7c71af 100644 --- a/transcode.c +++ b/transcode.c @@ -1878,16 +1878,28 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, rb_econv_option_t *ecopts) to_encidx = str_transcode_enc_args(str, argv[0], argc==1 ? Qnil : argv[1], &from_e, &from_enc, &to_e, &to_enc); - if (from_enc && from_enc == to_enc) { - return -1; - } - if (from_enc && to_enc && rb_enc_asciicompat(from_enc) && rb_enc_asciicompat(to_enc)) { - if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) { - return to_encidx; - } + if ((ecopts->flags & (ECONV_UNIVERSAL_NEWLINE_DECODER| + ECONV_CRLF_NEWLINE_ENCODER| + ECONV_CR_NEWLINE_ENCODER)) == 0) { + if (from_enc && from_enc == to_enc) { + return -1; + } + if (from_enc && to_enc && rb_enc_asciicompat(from_enc) && rb_enc_asciicompat(to_enc)) { + if (ENC_CODERANGE(str) == ENC_CODERANGE_7BIT) { + return to_encidx; + } + } + if (encoding_equal(from_e, to_e)) { + return -1; + } } - if (encoding_equal(from_e, to_e)) { - return -1; + else { + if (encoding_equal(from_e, to_e)) { + /* newline conversion only. + * xxx: this assumes ascii compatible encoding. */ + from_e = ""; + to_e = ""; + } } fromp = sp = (unsigned char *)RSTRING_PTR(str); |