1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* transcode.c (str_transcode0): don't short cut for newline conversion.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18852 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-08-25 15:58:35 +00:00
parent 6c1190d10f
commit 1a805010ed
2 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Tue Aug 26 00:55:46 2008 Tanaka Akira <akr@fsij.org>
* transcode.c (str_transcode0): don't short cut for newline conversion.
Tue Aug 26 00:36:01 2008 Tanaka Akira <akr@fsij.org> Tue Aug 26 00:36:01 2008 Tanaka Akira <akr@fsij.org>
* io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for * io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for

12
transcode.c
View File

@ -1878,6 +1878,9 @@ 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); to_encidx = str_transcode_enc_args(str, argv[0], argc==1 ? Qnil : argv[1], &from_e, &from_enc, &to_e, &to_enc);
if ((ecopts->flags & (ECONV_UNIVERSAL_NEWLINE_DECODER|
ECONV_CRLF_NEWLINE_ENCODER|
ECONV_CR_NEWLINE_ENCODER)) == 0) {
if (from_enc && from_enc == to_enc) { if (from_enc && from_enc == to_enc) {
return -1; return -1;
} }
@ -1889,6 +1892,15 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, rb_econv_option_t *ecopts)
if (encoding_equal(from_e, to_e)) { if (encoding_equal(from_e, to_e)) {
return -1; 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); fromp = sp = (unsigned char *)RSTRING_PTR(str);
slen = RSTRING_LEN(str); slen = RSTRING_LEN(str);