Reworked attach to add charset to Content-Type string for

[nmh] / uip / mhshowsbr.c

diff --git a/uip/mhshowsbr.c b/uip/mhshowsbr.c
index 67aaa4d0548abbf95a895ff431e465747bc32fdf..fe0e33041ba2fa9e7dbdc6547a5aa4058b5eac2e 100644 (file)
--- a/uip/mhshowsbr.c
+++ b/uip/mhshowsbr.c
@@ -12,7 +12,6 @@
 #include <h/signals.h>
 #include <h/md5.h>
 #include <setjmp.h>
-#include <signal.h>
 #include <h/mts.h>
 #include <h/tws.h>
 #include <h/mime.h>
@@ -224,39 +223,31 @@ show_switch (CT ct, int serial, int alternate)
     switch (ct->c_type) {
        case CT_MULTIPART:
            return show_multi (ct, serial, alternate);
-           break;
 
        case CT_MESSAGE:
            switch (ct->c_subtype) {
                case MESSAGE_PARTIAL:
                    return show_partial (ct, serial, alternate);
-                   break;
 
                case MESSAGE_EXTERNAL:
                    return show_external (ct, serial, alternate);
-                   break;
 
                case MESSAGE_RFC822:
                default:
                    return show_message_rfc822 (ct, serial, alternate);
-                   break;
            }
-           break;
 
        case CT_TEXT:
            return show_text (ct, serial, alternate);
-           break;
 
        case CT_AUDIO:
        case CT_IMAGE:
        case CT_VIDEO:
        case CT_APPLICATION:
            return show_content (ct, serial, alternate);
-           break;
 
        default:
            adios (NULL, "unknown content type %d", ct->c_type);
-           break;
     }
 
     return 0;  /* NOT REACHED */
@@ -621,7 +612,7 @@ show_text (CT ct, int serial, int alternate)
      */
     if (!alternate || ct->c_subtype == TEXT_PLAIN) {
        snprintf (buffer, sizeof(buffer), "%%p%s '%%F'", progsw ? progsw :
-               moreproc && *moreproc ? moreproc : "more");
+               moreproc && *moreproc ? moreproc : DEFAULT_PAGER);
        cp = (ct->c_showproc = add (buffer, NULL));
        return show_content_aux (ct, serial, alternate, cp, NULL);
     }