X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhlistsbr.c;h=5dee1157766191485bf2e641bf8f5ee33e79b8d6;hb=75fca31a5b9d5c1a99c74ab14c94438d8852fba9;hp=9cd331a86068ab0079e2d06e56417176ed0c4681;hpb=6bd5e1baa07e971d42188391a12f330b82174c48;p=mmh

diff --git a/uip/mhlistsbr.c b/uip/mhlistsbr.c
index 9cd331a..5dee115 100644
--- a/uip/mhlistsbr.c
+++ b/uip/mhlistsbr.c
@@ -36,7 +36,6 @@ static void list_single_message(CT, int, int, int);
 static int list_debug(CT);
 static int list_multi(CT, int, int, int, int);
 static int list_partial(CT, int, int, int, int);
-static int list_external(CT, int, int, int, int);
 static int list_encoding(CT);
 
 
@@ -106,22 +105,12 @@ list_switch(CT ct, int toplevel, int realsize, int verbose, int debug)
 		break;
 
 	case CT_MESSAGE:
-		switch (ct->c_subtype) {
-		case MESSAGE_PARTIAL:
+		if (ct->c_subtype == MESSAGE_PARTIAL) {
 			return list_partial(ct, toplevel, realsize, verbose,
 						debug);
-			break;
-
-		case MESSAGE_EXTERNAL:
-			return list_external(ct, toplevel, realsize, verbose,
-						debug);
-			break;
-
-		case MESSAGE_RFC822:
-		default:
+		} else {
 			return list_content(ct, toplevel, realsize, verbose,
 						debug);
-			break;
 		}
 		break;
 
@@ -205,7 +194,7 @@ list_content(CT ct, int toplevel, int realsize, int verbose, int debug)
 		CI ci = &ct->c_ctinfo;
 
 		for (ap = ci->ci_attrs, ep = ci->ci_values; *ap; ap++, ep++) {
-			printf("\t %s=\"%s\"\n", *ap, *ep);
+			printf("\t\t%s=\"%s\"\n", *ap, *ep);
 		}
 
 		/*
@@ -266,8 +255,8 @@ list_debug(CT ct)
 			 ct->c_type, ct->c_subtype,
 			 (unsigned int)(unsigned long) ct->c_ctparams);
 
+	fprintf(stderr, "    charset  \"%s\"\n", empty(ct->c_charset));
 	fprintf(stderr, "    showproc  \"%s\"\n", empty(ct->c_showproc));
-	fprintf(stderr, "    termproc  \"%s\"\n", empty(ct->c_termproc));
 	fprintf(stderr, "    storeproc \"%s\"\n", empty(ct->c_storeproc));
 
 	/* print transfer encoding information */
@@ -346,54 +335,6 @@ list_partial(CT ct, int toplevel, int realsize, int verbose, int debug)
 
 
 /*
-** list content information for type "message/external"
-*/
-static int
-list_external(CT ct, int toplevel, int realsize, int verbose, int debug)
-{
-	struct exbody *e = (struct exbody *) ct->c_ctparams;
-
-	/*
-	 * First list the information for the
-	 * message/external content itself.
-	 */
-	list_content(ct, toplevel, realsize, verbose, debug);
-
-	if (verbose) {
-		if (e->eb_name)
-			printf("\t     name=\"%s\"\n", e->eb_name);
-		if (e->eb_dir)
-			printf("\t     directory=\"%s\"\n", e->eb_dir);
-		if (e->eb_site)
-			printf("\t     site=\"%s\"\n", e->eb_site);
-		if (e->eb_server)
-			printf("\t     server=\"%s\"\n", e->eb_server);
-		if (e->eb_subject)
-			printf("\t     subject=\"%s\"\n", e->eb_subject);
-
-		/* This must be defined */
-		printf("\t     access-type=\"%s\"\n", e->eb_access);
-
-		if (e->eb_mode)
-			printf("\t     mode=\"%s\"\n", e->eb_mode);
-		if (e->eb_permission)
-			printf("\t     permission=\"%s\"\n", e->eb_permission);
-
-		if (e->eb_flags == NOTOK)
-			printf("\t     [service unavailable]\n");
-	}
-
-	/*
-	** Now list the information for the external content
-	** to which this content points.
-	*/
-	list_content(e->eb_content, 0, realsize, verbose, debug);
-
-	return OK;
-}
-
-
-/*
 ** list information about the Content-Transfer-Encoding
 ** used by a content.
 */