ruby-changes:42349
From: naruse <ko1@a...>
Date: Wed, 30 Mar 2016 02:08:04 +0900 (JST)
Subject: [ruby-changes:42349] naruse:r54423 (trunk): * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0.
naruse 2016-03-30 01:57:33 +0900 (Wed, 30 Mar 2016) New Revision: 54423 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54423 Log: * ext/nkf/nkf-utf8/nkf.c: Merge upstream 4f3edf80a0. patched by Anton Sivakov [Bug #12201] [Bug #12202] Modified files: trunk/ChangeLog trunk/ext/nkf/nkf-utf8/nkf.c Index: ext/nkf/nkf-utf8/nkf.c =================================================================== --- ext/nkf/nkf-utf8/nkf.c (revision 54422) +++ ext/nkf/nkf-utf8/nkf.c (revision 54423) @@ -3834,8 +3834,8 @@ fold_conv(nkf_char c2, nkf_char c1) https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L3834 f_prev = c1; f_line = 0; fold_state = CR; - } else if ((f_prev == c1 && !fold_preserve_f) - || (f_prev == LF && fold_preserve_f) + } else if ((f_prev == c1) + || (f_prev == LF) ) { /* duplicate newline */ if (f_line) { f_line = 0; @@ -5436,8 +5436,8 @@ mime_putc(nkf_char c) https://github.com/ruby/ruby/blob/trunk/ext/nkf/nkf-utf8/nkf.c#L5436 mimeout_state.buf[mimeout_state.count++] = (char)c; if (mimeout_state.count>MIMEOUT_BUF_LENGTH) { eof_mime(); - for (i=0;i<mimeout_state.count;i++) { - (*o_mputc)(mimeout_state.buf[i]); + for (j=0;i<mimeout_state.count;j++) { + (*o_mputc)(mimeout_state.buf[j]); base64_count++; } mimeout_state.count = 0; Index: ChangeLog =================================================================== --- ChangeLog (revision 54422) +++ ChangeLog (revision 54423) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Wed Mar 30 01:56:06 2016 NARUSE, Yui <naruse@r...> + + * 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@r...> * tool/redmine-backporter.rb: add given revision to current changests -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/