X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=b5ecd099ee65fd9cf7a0f8cd8771b6e979cd7f8d;hb=5c86fbdc071e1c322ccf341855eaa813807776b4;hp=13a65e40cdc222934fe963d669a7a46f511c49ec;hpb=0da86af19c369b20713d0cedf7b0b3319560f69e;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 13a65e4..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
@@ -233,13 +233,13 @@ show_content(CT ct, int alternate)
 	CI ci = &ct->c_ctinfo;
 
 	/* Check for mhshow-show-type/subtype */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
-				invo_name, ci->ci_type, ci->ci_subtype);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+				ci->ci_type, ci->ci_subtype);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_content_aux(ct, alternate, cp, NULL);
 
 	/* Check for mhshow-show-type */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_content_aux(ct, alternate, cp, NULL);
 
@@ -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);
@@ -504,13 +504,13 @@ show_text(CT ct, int alternate)
 	CI ci = &ct->c_ctinfo;
 
 	/* Check for mhshow-show-type/subtype */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
-			invo_name, ci->ci_type, ci->ci_subtype);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+			ci->ci_type, ci->ci_subtype);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_content_aux(ct, alternate, cp, NULL);
 
 	/* Check for mhshow-show-type */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_content_aux(ct, alternate, cp, NULL);
 
@@ -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;
@@ -545,13 +544,13 @@ show_multi(CT ct, int alternate)
 	CI ci = &ct->c_ctinfo;
 
 	/* Check for mhshow-show-type/subtype */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
-			invo_name, ci->ci_type, ci->ci_subtype);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+			ci->ci_type, ci->ci_subtype);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_multi_aux(ct, alternate, cp);
 
 	/* Check for mhshow-show-type */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_multi_aux(ct, alternate, cp);
 
@@ -850,13 +849,13 @@ show_message_rfc822(CT ct, int alternate)
 	CI ci = &ct->c_ctinfo;
 
 	/* Check for mhshow-show-type/subtype */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s/%s",
-				invo_name, ci->ci_type, ci->ci_subtype);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s/%s",
+				ci->ci_type, ci->ci_subtype);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_content_aux(ct, alternate, cp, NULL);
 
 	/* Check for mhshow-show-type */
-	snprintf(buffer, sizeof(buffer), "%s-show-%s", invo_name, ci->ci_type);
+	snprintf(buffer, sizeof(buffer), "mhshow-show-%s", ci->ci_type);
 	if ((cp = context_find(buffer)) && *cp != '\0')
 		return show_content_aux(ct, alternate, cp, NULL);