From f90d6b46ae254dfb0250d38228fbcd9334127ab2 Mon Sep 17 00:00:00 2001
From: Rei FURUKAWA <rei_furukawa@users.sourceforge.jp>
Date: Thu, 28 Nov 2002 01:00:55 +0000
Subject: [PATCH] =?utf8?q?=E9=87=8D=E6=9D=91=E3=81=95=E3=82=93=E3=81=AE?=
 =?utf8?q?=E3=83=91=E3=83=83=E3=83=81=20=E3=83=BB-EsLw=20=E3=81=AE?=
 =?utf8?q?=E3=82=88=E3=81=86=E3=81=AB=E9=80=A3=E7=B6=9A=E3=81=97=E3=81=9F?=
 =?utf8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E6=8C=87?=
 =?utf8?q?=E5=AE=9A=E3=81=97=E3=81=9F=E3=81=A8=E3=81=8D=20Unicode(-w)?=
 =?utf8?q?=E5=87=BA=E5=8A=9B=E3=81=AB=E3=81=AA=E3=81=A3=E3=81=A6=E3=81=97?=
 =?utf8?q?=E3=81=BE=E3=81=86=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3=20?=
 =?utf8?q?=E3=83=BBecho=20-n=20'=E3=83=86=E3=82=B9=E3=83=88'=20|=20nkf=20-?=
 =?utf8?q?M=20=E3=81=97=E3=81=9F=E6=99=82=E3=81=AB=E6=9C=80=E5=BE=8C?=
 =?utf8?q?=E3=81=AE=20=3F=3D=20=E3=81=8C=E5=87=BA=E5=8A=9B=E3=81=95?=
 =?utf8?q?=E3=82=8C=E3=81=AA=E3=81=84=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=20=E3=83=BBnkf=20-M=20=E3=81=A7=E6=94=B9=E8=A1=8C=E5=BE=8C?=
 =?utf8?q?=E3=81=AE=E3=82=B9=E3=83=9A=E3=83=BC=E3=82=B9=E3=82=92=E3=82=BF?=
 =?utf8?q?=E3=83=96=E3=81=AB=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 nkf.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/nkf.c b/nkf.c
index 618b5f4..427acfa 100644
--- a/nkf.c
+++ b/nkf.c
@@ -1007,7 +1007,7 @@ options(cp)
             } else if (*cp=='S') {
                 mime_f = STRICT_MIME; cp++;
             } else if (*cp=='0') {
-                mime_f = FALSE;
+                mime_f = FALSE; cp++;
             }
             continue;
         case 'M':   /* MIME output */
@@ -1047,13 +1047,13 @@ options(cp)
             continue;
         case 'L':  /* line mode */
             if (*cp=='u') {         /* unix */
-                crmode_f = NL;
+                crmode_f = NL; cp++;
             } else if (*cp=='m') { /* mac */
-                crmode_f = CR;
+                crmode_f = CR; cp++;
             } else if (*cp=='w') { /* windows */
-                crmode_f = CRLF;
+                crmode_f = CRLF; cp++;
             } else if (*cp=='0') { /* no conversion  */
-                crmode_f = 0;
+                crmode_f = 0; cp++;
             }
             continue;
         case ' ':    
@@ -1295,7 +1295,8 @@ void
 std_putc(c)
 int c;
 {
-    putchar(c);
+    if(c!=EOF)
+      putchar(c);
 }
 
 int
@@ -1984,6 +1985,7 @@ w_oconv(c2, c1)
                     c1;
 {
     if (c2 == EOF) {
+        (*o_putc)(EOF);
         return;
     } else if (c2 == 0) { 
 	output_mode = ASCII;
@@ -2020,6 +2022,7 @@ w_oconv16(c2, c1)
 	w_oconv16_begin_f=1;
     }
     if (c2 == EOF) {
+        (*o_putc)(EOF);
         return;
     } else if (c2 == 0) { 
         (*o_putc)(0);
@@ -2042,6 +2045,7 @@ e_oconv(c2, c1)
                     c1;
 {
     if (c2 == EOF) {
+        (*o_putc)(EOF);
         return;
     } else if (c2 == 0) { 
 	output_mode = ASCII;
@@ -2072,6 +2076,7 @@ s_oconv(c2, c1)
                     c1;
 {
     if (c2 == EOF) {
+        (*o_putc)(EOF);
         return;
     } else if (c2 == 0) {
 	output_mode = ASCII;
@@ -2106,6 +2111,7 @@ j_oconv(c2, c1)
             (*o_putc)(ascii_intro);
 	    output_mode = ASCII;
         }
+        (*o_putc)(EOF);
     } else if (c2==X0201) {
         if (output_mode!=X0201) {
             output_mode = X0201;
@@ -2154,7 +2160,7 @@ base64_conv(c2, c1)
     } else if (base64_count>66 && mimeout_mode) {
 	(*o_base64conv)(EOF,0);
 	(*o_putc)(NL);
-	(*o_putc)(' ');
+	(*o_putc)('\t'); base64_count += 7;
     }
     (*o_base64conv)(c2,c1);
 }
-- 
2.11.0