From: NARUSE, Yui <naruse@users.sourceforge.jp>
Date: Thu, 7 Jan 2010 06:39:13 +0000 (+0900)
Subject: JIS X 0201's MIME Encode default should be ISO-2022-JP B encoding. [nkf-bug:20079]
X-Git-Tag: v2_1_3~48
X-Git-Url: http://git.osdn.net/view?p=nkf%2Fnkf.git;a=commitdiff_plain;h=304aa30dd6ebed98295a5bde55e69a55a9546399

JIS X 0201's MIME Encode default should be ISO-2022-JP B encoding. [nkf-bug:20079]
---

diff --git a/nkf.c b/nkf.c
index fc1233b..979955c 100644
--- a/nkf.c
+++ b/nkf.c
@@ -3821,6 +3821,7 @@ static const unsigned char *mime_pattern[] = {
     (const unsigned char *)"\075?ISO-8859-1?Q?",
     (const unsigned char *)"\075?ISO-8859-1?B?",
     (const unsigned char *)"\075?ISO-2022-JP?B?",
+    (const unsigned char *)"\075?ISO-2022-JP?B?",
     (const unsigned char *)"\075?ISO-2022-JP?Q?",
 #if defined(UTF8_INPUT_ENABLE)
     (const unsigned char *)"\075?UTF-8?B?",
@@ -3841,7 +3842,7 @@ nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
 };
 
 static const nkf_char mime_encode[] = {
-    EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201_1976_K,
+    EUC_JP, SHIFT_JIS, ISO_8859_1, ISO_8859_1, JIS_X_0208, JIS_X_0201_1976_K, JIS_X_0201_1976_K,
 #if defined(UTF8_INPUT_ENABLE)
     UTF_8, UTF_8,
 #endif
@@ -3850,7 +3851,7 @@ static const nkf_char mime_encode[] = {
 };
 
 static const nkf_char mime_encode_method[] = {
-    'B', 'B','Q', 'B', 'B', 'Q',
+    'B', 'B','Q', 'B', 'B', 'B', 'Q',
 #if defined(UTF8_INPUT_ENABLE)
     'B', 'Q',
 #endif
diff --git a/nkf_test.pl b/nkf_test.pl
index b1e40ea..94e4ba5 100644
--- a/nkf_test.pl
+++ b/nkf_test.pl
@@ -1031,6 +1031,9 @@ printf "%-40s",  "[nkf-forum:47327]    ";
 printf "%-40s",  "[nkf-forum:47334]    ";
     &test("$nkf -w",pack('H*','feff006100620063000a'),"abc\n");
 
+printf "%-40s",  "[nkf-bug:20079]    ";
+    &test("$nkf -jSxM","\xBB \xBB","=?ISO-2022-JP?B?GyhJOxsoQiAbKEk7GyhC?=");
+
     if (!NKF) {
 printf "%-40s", "Guess NL";
 &command_tests(