X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhbuild.c;h=c0320226daf06050cc6a303479e422f234c1a6e1;hp=fe3e946685f825f35d947159e88c91974c10120f;hb=HEAD;hpb=04a3dfc70394a517a79340a7d3ecd9c6a23d0bee

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index fe3e946..f9674a3 100644
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -45,12 +45,13 @@ static struct swit switches[] = {
 	{ NULL, 0 }
 };
 
+char *version=VERSION;
 
 /*
 ** Directory to place tmp files.  This must
 ** be set before these routines are called.
 */
-char *tmp;
+extern char *tmp;
 
 pid_t xpid = 0;
 
@@ -349,6 +350,8 @@ build_mime(char *infile)
 	*/
 	for (compnum = 1, state = FLD2;;) {
 		switch (state = m_getfld2(state, &f, in)) {
+		case LENERR2:
+			state = FLD2;
 		case FLD2:
 			compnum++;
 
@@ -383,7 +386,6 @@ build_mime(char *infile)
 			adios(EX_CONFIG, NULL, "draft has empty body -- no directives!");
 			/* NOTREACHED */
 
-		case LENERR2:
 		case FMTERR2:
 		case IOERR2:
 			adios(EX_CONFIG, NULL, "message format error in component #%d",
@@ -414,7 +416,7 @@ build_mime(char *infile)
 	add_header(ct, np, vp);
 
 	/*
-	** We initally assume we will find multiple contents in the
+	** We initially assume we will find multiple contents in the
 	** draft.  So create a multipart/mixed content to hold everything.
 	** We can remove this later, if it is not needed.
 	*/
@@ -1276,13 +1278,8 @@ scan_content(CT ct)
 	case CT_TEXT:
 		check8bit = 1;
 		checkboundary = 1;
-		if (ct->c_subtype == TEXT_PLAIN) {
-			checklinelen = 0;
-			checklinespace = 0;
-		} else {
-			checklinelen = 1;
-			checklinespace = 1;
-		}
+		checklinelen = 1;
+		checklinespace = 1;
 		break;
 
 	case CT_MESSAGE: