** E-Mail: furukawa@tcp-ip.or.jp
** \e$B$^$G8fO"Mm$r$*4j$$$7$^$9!#\e(B
***********************************************************************/
-/* $Id: nkf.c,v 1.120 2007/01/28 06:30:05 naruse Exp $ */
+/* $Id: nkf.c,v 1.121 2007/03/13 18:52:16 naruse Exp $ */
#define NKF_VERSION "2.0.8"
-#define NKF_RELEASE_DATE "2007-01-28"
+#define NKF_RELEASE_DATE "2007-03-14"
#include "config.h"
#include "utf8tbl.h"
int i;
int j;
p = mime_pattern[0];
- for(i=0;mime_encode[i];i++) {
+ for(i=0;mime_pattern[i];i++) {
if (mode == mime_encode[i]) {
p = mime_pattern[i];
break;
if (mimeout_mode=='Q') {
if (c <= DEL && (output_mode==ASCII ||output_mode == ISO8859_1 ) ) {
- if (c <= SPACE) {
+ if (c == CR || c == NL) {
+ close_mime();
+ (*o_mputc)(c);
+ base64_count = 0;
+ return;
+ } else if (c <= SPACE) {
close_mime();
(*o_mputc)(SPACE);
base64_count++;
mimeout_buf_count = 1;
}else{
if (base64_count > 1
- && base64_count + mimeout_buf_count > 76){
+ && base64_count + mimeout_buf_count > 76
+ && mimeout_buf[0] != CR && mimeout_buf[0] != NL){
(*o_mputc)(NL);
base64_count = 0;
if (!nkf_isspace(mimeout_buf[0])){