X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=fe40f9d808171d39fac2a362fc1d26d094abee61;hb=1201af682c2a7e34d4d598e62718306b885a187e;hp=9b7e7b0556e7bc3810ba169a9c4e8b0fc85f3f8e;hpb=8d77b48284c58c135a6b2787e721597346ab056d;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 9b7e7b0..fe40f9d 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -10,7 +10,6 @@
 #include <fcntl.h>
 #include <h/signals.h>
 #include <errno.h>
-#include <setjmp.h>
 #include <signal.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -34,8 +33,8 @@ void content_error(char *, CT, char *, ...);
 void flush_errors(void);
 
 /* mhlistsbr.c */
-int list_switch(CT, int, int, int, int);
-int list_content(CT, int, int, int, int);
+int list_switch(CT, int, int, int);
+int list_content(CT, int, int, int);
 
 /*
 ** prototypes
@@ -248,7 +247,7 @@ show_content(CT ct, int alternate)
 
 	/* complain if we are not a part of a multipart/alternative */
 	if (!alternate)
-		content_error(NULL, ct, "don't know how to display content");
+		return show_content_aux(ct, alternate, "%l", NULL);
 
 	return NOTOK;
 }
@@ -458,9 +457,9 @@ show_content_aux2(CT ct, int alternate, char *cracked,
 
 	if (xlist) {
 		if (ct->c_type == CT_MULTIPART)
-			list_content(ct, -1, 1, 0, 0);
+			list_content(ct, -1, 0, 0);
 		else
-			list_switch(ct, -1, 1, 0, 0);
+			list_switch(ct, -1, 0, 0);
 	}
 
 	fflush(stdout);
@@ -870,7 +869,7 @@ show_message_rfc822(CT ct, int alternate)
 
 	/* complain if we are not a part of a multipart/alternative */
 	if (!alternate)
-		content_error(NULL, ct, "don't know how to display content");
+		return show_content_aux(ct, alternate, "%l", NULL);
 
 	return NOTOK;
 }
@@ -883,8 +882,8 @@ show_message_rfc822(CT ct, int alternate)
 static int
 show_partial(CT ct, int alternate)
 {
-	content_error(NULL, ct,
-		"in order to display this message, you must reassemble it");
+	show_content_aux(ct, alternate, "%l", NULL);
+	puts("in order to display this message, you must reassemble it");
 	return NOTOK;
 }
 
@@ -900,11 +899,11 @@ show_external(CT ct, int alternate)
 	FILE *fp;
 	char buf[BUFSIZ];
 
-	msg = add("You need to fetch the contents yourself:", NULL);
+	msg = add("You need to fetch the contents yourself:\n", NULL);
 	ap = ct->c_ctinfo.ci_attrs;
 	ep = ct->c_ctinfo.ci_values;
 	for (; *ap; ap++, ep++) {
-		msg = add(concat("\n\t", *ap, ": ", *ep, NULL), msg);
+		msg = add(concat("\t", *ap, ": ", *ep, NULL), msg);
 	}
 	if (!(fp = fopen(ct->c_file, "r"))) {
 		adios(ct->c_file, "unable to open");
@@ -915,9 +914,13 @@ show_external(CT ct, int alternate)
 			adios(ct->c_file, "unable to read");
 		}
 		*strchr(buf, '\n') = '\0';
-		msg = add(concat("\n\t", buf, NULL), msg);
+		if (!*buf) {
+			continue;  /* skip empty lines */
+		}
+		msg = add(concat("\t", buf, "\n", NULL), msg);
 	}
 	fclose(fp);
-	content_error(NULL, ct, msg);
+	show_content_aux(ct, alternate, "%l", NULL);
+	fputs(msg, stdout);
 	return OK;
 }