X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhoutsbr.c;h=97f97f08ffdf3eae1e9444ae2b01327aeb6674c1;hb=80bf776d0a4587c477bb8a248b9dbe1a31e74575;hp=92352539e5534c045a127d6b047ab8ea63eb7675;hpb=2f689a1cb907a5de04e6d39ffd217a69af3216c7;p=mmh

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 9235253..97f97f0 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -3,8 +3,6 @@
  * mhoutsbr.c -- routines to output MIME messages
  *            -- given a Content structure
  *
- * $Id$
- *
  * This code is Copyright (c) 2002, by the authors of nmh.  See the
  * COPYRIGHT file in the root directory of the nmh distribution for
  * complete copyright information.
@@ -21,10 +19,6 @@
 #include <h/mime.h>
 #include <h/mhparse.h>
 
-#ifdef HAVE_SYS_WAIT_H
-# include <sys/wait.h>
-#endif
-
 
 extern int ebcdicsw;
 
@@ -63,15 +57,11 @@ static char ebcdicsafe[0x100] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
 
-static char nib2b64[0x40+1] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
 /*
  * prototypes
  */
 int output_message (CT, char *);
 int output_message_fp (CT, FILE *, char *);
-int writeBase64aux (FILE *, FILE *);
 
 /*
  * static prototypes
@@ -81,7 +71,7 @@ static void output_headers (CT, FILE *);
 static int writeExternalBody (CT, FILE *);
 static int write8Bit (CT, FILE *);
 static int writeQuoted (CT, FILE *);
-static int writeBase64 (CT, FILE *);
+static int writeBase64ct (CT, FILE *);
 
 
 /*
@@ -205,7 +195,7 @@ output_content (CT ct, FILE *out)
 
 	case CE_BASE64:
 	    putc ('\n', out);
-	    result = writeBase64 (ct, out);
+	    result = writeBase64ct (ct, out);
 	    break;
 
 	case CE_BINARY:
@@ -417,7 +407,7 @@ three_print:
  */
 
 static int
-writeBase64 (CT ct, FILE *out)
+writeBase64ct (CT ct, FILE *out)
 {
     int	fd, result;
     char *file;
@@ -431,51 +421,3 @@ writeBase64 (CT ct, FILE *out)
     (*ct->c_ceclosefnx) (ct);
     return result;
 }
-
-
-int
-writeBase64aux (FILE *in, FILE *out)
-{
-    int	cc, n;
-    char inbuf[3];
-
-    n = BPERLIN;
-    while ((cc = fread (inbuf, sizeof(*inbuf), sizeof(inbuf), in)) > 0) {
-	unsigned long bits;
-	char *bp;
-	char outbuf[4];
-
-	if (cc < sizeof(inbuf)) {
-	    inbuf[2] = 0;
-	    if (cc < sizeof(inbuf) - 1)
-		inbuf[1] = 0;
-	}
-	bits = (inbuf[0] & 0xff) << 16;
-	bits |= (inbuf[1] & 0xff) << 8;
-	bits |= inbuf[2] & 0xff;
-
-	for (bp = outbuf + sizeof(outbuf); bp > outbuf; bits >>= 6)
-	    *--bp = nib2b64[bits & 0x3f];
-	if (cc < sizeof(inbuf)) {
-	    outbuf[3] = '=';
-	    if (cc < sizeof inbuf - 1)
-		outbuf[2] = '=';
-	}
-
-	fwrite (outbuf, sizeof(*outbuf), sizeof(outbuf), out);
-
-	if (cc < sizeof(inbuf)) {
-	    putc ('\n', out);
-	    return OK;
-	}
-
-	if (--n <= 0) {
-	    n = BPERLIN;
-	    putc ('\n', out);
-	}
-    }
-    if (n != BPERLIN)
-	putc ('\n', out);
-
-    return OK;
-}