X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhoutsbr.c;h=5d267ef70777b25076c02eeacca27dbfe2abafec;hp=03aff614477d8458dff29b19417f9217e7ad49da;hb=c164fa6824a65205d96c9d1450dc656bec66553a;hpb=90d53cbbe431a89ac2066a527bbfe46ac0f3cbe7

diff --git a/uip/mhoutsbr.c b/uip/mhoutsbr.c
index 03aff61..5d267ef 100644
--- a/uip/mhoutsbr.c
+++ b/uip/mhoutsbr.c
@@ -68,7 +68,6 @@ int writeBase64aux(FILE *, FILE *);
 */
 static int output_content(CT, FILE *);
 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 *);
@@ -125,14 +124,6 @@ output_content(CT ct, FILE *out)
 	output_headers(ct, out);
 
 	/*
-	** If this is the internal content structure for a
-	** "message/external", then we are done with the
-	** headers (since it has no body).
-	*/
-	if (ct->c_ctexbody)
-		return OK;
-
-	/*
 	** Now output the content bodies.
 	*/
 	switch (ct->c_type) {
@@ -158,19 +149,7 @@ output_content(CT ct, FILE *out)
 
 	case CT_MESSAGE:
 		putc('\n', out);
-		if (ct->c_subtype == MESSAGE_EXTERNAL) {
-			struct exbody *e;
-
-			e = (struct exbody *) ct->c_ctparams;
-			if (output_content(e->eb_content, out) == NOTOK)
-				return NOTOK;
-
-			/* output phantom body for access-type "mail-server" */
-			if (e->eb_body)
-				writeExternalBody(ct, out);
-		} else {
-			result = write8Bit(ct, out);
-		}
+		result = write8Bit(ct, out);
 		break;
 
 	/*
@@ -233,78 +212,6 @@ output_headers(CT ct, FILE *out)
 
 
 /*
-** Write the phantom body for access-type "mail-server".
-*/
-
-static int
-writeExternalBody(CT ct, FILE *out)
-{
-	char **ap, **ep, *cp;
-	struct exbody *e = (struct exbody *) ct->c_ctparams;
-
-	putc('\n', out);
-	for (cp = e->eb_body; *cp; cp++) {
-		CT ct2 = e->eb_content;
-		CI ci2 = &ct2->c_ctinfo;
-
-		if (*cp == '\\') {
-			switch (*++cp) {
-			case 'I':
-				if (ct2->c_id) {
-					char *dp = trimcpy(ct2->c_id);
-
-					fputs(dp, out);
-					free(dp);
-				}
-				continue;
-
-			case 'N':
-				for (ap = ci2->ci_attrs, ep = ci2->ci_values;
-						*ap; ap++, ep++)
-					if (!mh_strcasecmp(*ap, "name")) {
-						fprintf(out, "%s", *ep);
-						break;
-					}
-				continue;
-
-			case 'T':
-				fprintf(out, "%s/%s", ci2->ci_type,
-						ci2->ci_subtype);
-				for (ap = ci2->ci_attrs, ep = ci2->ci_values;
-						*ap; ap++, ep++)
-					fprintf(out, "; %s=\"%s\"", *ap, *ep);
-				continue;
-
-			case 'n':
-				putc('\n', out);
-				continue;
-
-			case 't':
-				putc('\t', out);
-				continue;
-
-			case '\0':
-				cp--;
-				break;
-
-			case '\\':
-			case '"':
-				break;
-
-			default:
-				putc('\\', out);
-				break;
-			}
-		}
-		putc(*cp, out);
-	}
-	putc('\n', out);
-
-	return OK;
-}
-
-
-/*
 ** Output a content without any transfer encoding
 */