X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhoutsbr.c;h=21c2e26318b68f5d5011bcc73f29f2d6a3188ff3;hp=5d267ef70777b25076c02eeacca27dbfe2abafec;hb=55eda7c77fdf33b0a7175968471df55e2600379c;hpb=c164fa6824a65205d96c9d1450dc656bec66553a

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 5d267ef..21c2e26 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -9,49 +9,11 @@
 
 #include <h/mh.h>
 #include <fcntl.h>
-#include <h/signals.h>
 #include <errno.h>
-#include <signal.h>
 #include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 
-extern int ebcdicsw;
-
-static char ebcdicsafe[0x100] = {
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
-	0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-	0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
 
 static char nib2b64[0x40+1] =
 	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -61,7 +23,6 @@ static char nib2b64[0x40+1] =
 */
 int output_message(CT, char *);
 int output_message_fp(CT, FILE *, char *);
-int writeBase64aux(FILE *, FILE *);
 
 /*
 ** static prototypes
@@ -71,6 +32,7 @@ static void output_headers(CT, FILE *);
 static int write8Bit(CT, FILE *);
 static int writeQuoted(CT, FILE *);
 static int writeBase64(CT, FILE *);
+static int writeBase64aux(FILE *, FILE *);
 
 
 /*
@@ -132,9 +94,6 @@ output_content(CT ct, FILE *out)
 		struct multipart *m;
 		struct part *part;
 
-		if (ct->c_rfc934)
-			putc('\n', out);
-
 		m = (struct multipart *) ct->c_ctparams;
 		for (part = m->mp_parts; part; part = part->mp_next) {
 			CT p = part->mp_part;
@@ -282,7 +241,7 @@ writeQuoted(CT ct, FILE *out)
 				break;
 
 			default:
-				if (*cp < '!' || *cp > '~' || (ebcdicsw && !ebcdicsafe[*cp & 0xff]))
+				if (*cp < '!' || *cp > '~')
 					goto three_print;
 				putc(*cp, out);
 				n++;
@@ -332,7 +291,7 @@ writeBase64(CT ct, FILE *out)
 }
 
 
-int
+static int
 writeBase64aux(FILE *in, FILE *out)
 {
 	unsigned int cc, n;