X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=uip%2Fmhshowsbr.c;h=3b91eebf78ccb74ff46e044cea46e94c96189d51;hb=e69044f7624abe5cb2cb796d528c0cc5f29515f7;hp=6f511f319d14cd9f51d5e836fe4d43568ff38828;hpb=13ae9ba066e6b8c114daa6714895a56816465f49;p=mmh

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 6f511f3..3b91eeb 100644
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -38,12 +38,6 @@ pid_t xpid = 0;
 static sigjmp_buf intrenv;
 
 
-/* termsbr.c */
-int SOprintf (char *, ...);
-
-/* mhparse.c */
-int pidcheck (int);
-
 /* mhmisc.c */
 int part_ok (CT, int);
 int type_ok (CT, int);
@@ -533,13 +527,13 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 	else
 	    list_switch (ct, -1, 1, 0, 0);
 
-	if (xpause && SOprintf ("Press <return> to show content..."))
-	    printf ("Press <return> to show content...");
-
-	if (xpause) {
+	if (xpause && isatty (fileno (stdout))) {
 	    int	intr;
 	    SIGNAL_HANDLER istat;
 
+	    if (SOprintf ("Press <return> to show content..."))
+		printf ("Press <return> to show content...");
+
 	    istat = SIGNAL (SIGINT, intrser);
 	    if ((intr = sigsetjmp (intrenv, 1)) == OK) {
 		fflush (stdout);
@@ -564,7 +558,7 @@ show_content_aux2 (CT ct, int serial, int alternate, char *cracked, char *buffer
 
     fflush (stdout);
 
-    for (i = 0; (child_id = vfork ()) == NOTOK && i < 5; i++)
+    for (i = 0; (child_id = vfork()) == NOTOK && i < 5; i++)
 	sleep (5);
     switch (child_id) {
 	case NOTOK:
@@ -661,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);
 }
 
 
@@ -986,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.
@@ -1078,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
 }