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

* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.

Browse Source 
patched by Anton Sivakov [Bug #12201] [Bug #12202]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54423 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-03-29 16:57:33 +00:00
parent 90b51e7033
commit 1d7cfff09b
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Mar 30 01:56:06 2016 NARUSE, Yui <naruse@ruby-lang.org>
* ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
patched by Anton Sivakov [Bug #12201] [Bug #12202]
Wed Mar 30 01:54:30 2016 NARUSE, Yui <naruse@ruby-lang.org> Wed Mar 30 01:54:30 2016 NARUSE, Yui <naruse@ruby-lang.org>
* tool/redmine-backporter.rb: add given revision to current changests * tool/redmine-backporter.rb: add given revision to current changests

8
ext/nkf/nkf-utf8/nkf.c
View File

@ -3834,8 +3834,8 @@ fold_conv(nkf_char c2, nkf_char c1)
f_prev = c1; f_prev = c1;
f_line = 0; f_line = 0;
fold_state = CR; fold_state = CR;
} else if ((f_prev == c1 && !fold_preserve_f) } else if ((f_prev == c1)
|| (f_prev == LF && fold_preserve_f) || (f_prev == LF)
) { /* duplicate newline */ ) { /* duplicate newline */
if (f_line) { if (f_line) {
f_line = 0; f_line = 0;
@ -5436,8 +5436,8 @@ mime_putc(nkf_char c)
mimeout_state.buf[mimeout_state.count++] = (char)c; mimeout_state.buf[mimeout_state.count++] = (char)c;
if (mimeout_state.count>MIMEOUT_BUF_LENGTH) { if (mimeout_state.count>MIMEOUT_BUF_LENGTH) {
eof_mime(); eof_mime();
for (i=0;i<mimeout_state.count;i++) { for (j=0;i<mimeout_state.count;j++) {
(*o_mputc)(mimeout_state.buf[i]); (*o_mputc)(mimeout_state.buf[j]);
base64_count++; base64_count++;
} }
mimeout_state.count = 0; mimeout_state.count = 0;