X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=3b91eebf78ccb74ff46e044cea46e94c96189d51;hb=bfad64befb4d6696fdfb63b119666eec4bac6fb3;hp=9c1c0de0a84b172e4201e41f36a7fb646676bb24;hpb=49e0326aeef4cdc75898bf3049bfa3c123688e0f;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 9c1c0de..3b91eeb 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -529,10 +529,10 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 
 	if (xpause && isatty (fileno (stdout))) {
 	    int	intr;
+	    SIGNAL_HANDLER istat;
 
 	    if (SOprintf ("Press <return> to show content..."))
 		printf ("Press <return> to show content...");
-	    SIGNAL_HANDLER istat;
 
 	    istat = SIGNAL (SIGINT, intrser);
 	    if ((intr = sigsetjmp (intrenv, 1)) == OK) {
@@ -655,14 +655,11 @@ show_multi (CT ct, int serial, int alternate)
 	return show_multi_aux (ct, serial, alternate, cp);
 
     /*
-     * Use default method to display this multipart content
-     * if it is not a (nested) part of a multipart/alternative,
-     * or if it is one of the known subtypes of multipart.
+     * Use default method to display this multipart content.  Even
+     * unknown types are displayable, since they're treated as mixed
+     * per RFC 2046.
      */
-    if (!alternate || ct->c_subtype != MULTI_UNKNOWN)
-	return show_multi_internal (ct, serial, alternate);
-
-    return NOTOK;
+    return show_multi_internal (ct, serial, alternate);
 }
 
 
@@ -980,7 +977,7 @@ raw:
     }
 
     if (buflen <= 0 ||
-        (ct->c_termproc && (size_t) buflen <= strlen(ct->c_termproc))) {
+        (ct->c_termproc && buflen <= (ssize_t) strlen(ct->c_termproc))) {
 	/* content_error would provide a more useful error message
 	 * here, except that if we got overrun, it probably would
 	 * too.
@@ -1072,11 +1069,6 @@ show_external (CT ct, int serial, int alternate)
 	return OK;
 
     return show_switch (p, serial, alternate);
-
-#if 0
-    content_error (NULL, p, "don't know how to display content");
-    return NOTOK;
-#endif
 }