X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=b5ecd099ee65fd9cf7a0f8cd8771b6e979cd7f8d;hb=8d8f1c3abc586c005c904e52c4adbfe694d2201c;hp=2a8bbf9269f2b56d5eeff212c2ec9856116ca0b2;hpb=4c1efddfd499300c7e74263e57d8aa137e84c853;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 2a8bbf9..b5ecd09 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -34,8 +34,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
@@ -458,9 +458,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);
@@ -519,15 +519,14 @@ show_text(CT ct, int alternate)
 	** if it is not a text part of a multipart/alternative
 	*/
 	if (!alternate || ct->c_subtype == TEXT_PLAIN) {
-		if (ct->c_charset && !check_charset(ct->c_charset,
-				strlen(ct->c_charset))) {
+		if (ct->c_charset && !is_native_charset(ct->c_charset)) {
 			snprintf(buffer, sizeof(buffer), "%%liconv -f '%s'",
 					ct->c_charset);
 		} else {
 			snprintf(buffer, sizeof(buffer), "%%lcat");
 		}
-		cp = (ct->c_showproc = getcpy(buffer));
-		return show_content_aux(ct, alternate, cp, NULL);
+		ct->c_showproc = getcpy(buffer);
+		return show_content_aux(ct, alternate, ct->c_showproc, NULL);
 	}
 
 	return NOTOK;