Expanded warning message for invalid Content-Transfer-Encoding.

[nmh] / uip / mshcmds.c

diff --git a/uip/mshcmds.c b/uip/mshcmds.c
index 64957e8e1f85cca7222396f522949e620895cf79..35e7d2737c04caaad2ec8e1b7b9f10f26962eb4c 100644 (file)
--- a/uip/mshcmds.c
+++ b/uip/mshcmds.c
@@ -15,7 +15,6 @@
 #include <h/tws.h>
 #include <h/mts.h>
 #include <errno.h>
 #include <h/tws.h>
 #include <h/mts.h>
 #include <errno.h>

-#include <setjmp.h>

 #include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>
 #include <signal.h>
 #include <h/msh.h>
 #include <h/picksbr.h>


@@ -33,13 +32,6 @@ static FILE *mhlfp;
  */
 typedef int (*qsort_comp) (const void *, const void *);
 
  */
 typedef int (*qsort_comp) (const void *, const void *);
 

-/*
- * prototypes
- */
-void clear_screen (void);   /* from termsbr.c */
-int SOprintf (char *, ...); /* from termsbr.c */
-int sc_width (void);        /* from termsbr.c */
-

 /*
  * static prototypes
  */
 /*
  * static prototypes
  */


@@ -59,9 +51,6 @@ static int process (int, char *, int, char **);
 static void copy_message (int, FILE *);
 static void copy_digest (int, FILE *);
 
 static void copy_message (int, FILE *);
 static void copy_digest (int, FILE *);
 

-/* from mhlsbr.c */
-int mhlsbr (int, char **, FILE *(*)());
-

 void
 forkcmd (char **args, char *pgm)
 {
 void
 forkcmd (char **args, char *pgm)
 {


@@ -1087,6 +1076,7 @@ void
 helpcmd (char **args)
 {
     int i;
 helpcmd (char **args)
 {
     int i;

+    NMH_UNUSED (args);

 
     for (i = 0; hlpmsg[i]; i++) {
        printf (hlpmsg[i], invo_name);
 
     for (i = 0; hlpmsg[i]; i++) {
        printf (hlpmsg[i], invo_name);


@@ -1124,7 +1114,8 @@ void
 markcmd (char **args)
 {
     int addsw = 0, deletesw = 0, debugsw = 0;
 markcmd (char **args)
 {
     int addsw = 0, deletesw = 0, debugsw = 0;

-    int listsw = 0, zerosw = 0, seqp = 0;
+    int listsw = 0, zerosw = 0;
+    size_t seqp = 0;

     int msgp = 0, msgnum;
     char *cp, buf[BUFSIZ];
     char *seqs[NUMATTRS + 1], *msgs[MAXARGS];
     int msgp = 0, msgnum;
     char *cp, buf[BUFSIZ];
     char *seqs[NUMATTRS + 1], *msgs[MAXARGS];


@@ -1289,57 +1280,53 @@ static struct swit mhnswit[] = {
     { "noauto", 0 },
 #define        MHNDEBUGSW          2
     { "debug", -5 },
     { "noauto", 0 },
 #define        MHNDEBUGSW          2
     { "debug", -5 },

-#define        MHNEBCDICSW         3
-    { "ebcdicsafe", 0 },
-#define        MHNNEBCDICSW        4
-    { "noebcdicsafe", 0 },
-#define        MHNFORMSW           5
+#define        MHNFORMSW           3

     { "form formfile", 4 },
     { "form formfile", 4 },

-#define        MHNHEADSW           6
+#define        MHNHEADSW           4

     { "headers", 0 },
     { "headers", 0 },

-#define        MHNNHEADSW          7
+#define        MHNNHEADSW          5

     { "noheaders", 0 },
     { "noheaders", 0 },

-#define        MHNLISTSW           8
+#define        MHNLISTSW           6

     { "list", 0 },
     { "list", 0 },

-#define        MHNNLISTSW          9
+#define        MHNNLISTSW          7

     { "nolist", 0 },
     { "nolist", 0 },

-#define        MHNPARTSW          10
+#define        MHNPARTSW           8

     { "part number", 0 },
     { "part number", 0 },

-#define        MHNSIZESW          11
+#define        MHNSIZESW           9

     { "realsize", 0 },
     { "realsize", 0 },

-#define        MHNNSIZESW         12
+#define        MHNNSIZESW         10

     { "norealsize", 0 },
     { "norealsize", 0 },

-#define        MHNRFC934SW        13
+#define        MHNRFC934SW        11

     { "rfc934mode", 0 },
     { "rfc934mode", 0 },

-#define        MHNNRFC934SW       14
+#define        MHNNRFC934SW       12

     { "norfc934mode", 0 },
     { "norfc934mode", 0 },

-#define        MHNSERIALSW        15
+#define        MHNSERIALSW        13

     { "serialonly", 0 },
     { "serialonly", 0 },

-#define        MHNNSERIALSW       16
+#define        MHNNSERIALSW       14

     { "noserialonly", 0 },
     { "noserialonly", 0 },

-#define        MHNSHOWSW          17
+#define        MHNSHOWSW          15

     { "show", 0 },
     { "show", 0 },

-#define        MHNNSHOWSW         18
+#define        MHNNSHOWSW         16

     { "noshow", 0 },
     { "noshow", 0 },

-#define        MHNSTORESW         19
+#define        MHNSTORESW         17

     { "store", 0 },
     { "store", 0 },

-#define        MHNNSTORESW        20
+#define        MHNNSTORESW        18

     { "nostore", 0 },
     { "nostore", 0 },

-#define        MHNTYPESW          21
+#define        MHNTYPESW          19

     { "type content", 0 },
     { "type content", 0 },

-#define        MHNVERBSW          22
+#define        MHNVERBSW          20

     { "verbose", 0 },
     { "verbose", 0 },

-#define        MHNNVERBSW         23
+#define        MHNNVERBSW         21

     { "noverbose", 0 },
     { "noverbose", 0 },

-#define        MHNHELPSW          24
+#define        MHNHELPSW          22

     { "help", 0 },
     { "help", 0 },

-#define        MHNPROGSW          25
+#define        MHNPROGSW          23

     { "moreproc program", -4 },
     { "moreproc program", -4 },

-#define        MHNNPROGSW         26
+#define        MHNNPROGSW         24

     { "nomoreproc", -3 },
     { "nomoreproc", -3 },

-#define        MHNLENSW           27
+#define        MHNLENSW           25

     { "length lines", -4 },
     { "length lines", -4 },

-#define        MHNWIDSW           28
+#define        MHNWIDSW           26

     { "width columns", -4 },
     { NULL, 0 }
 };
     { "width columns", -4 },
     { NULL, 0 }
 };


@@ -1374,8 +1361,6 @@ mhncmd (char **args)
                case MHNAUTOSW:
                case MHNNAUTOSW:
                case MHNDEBUGSW:
                case MHNAUTOSW:
                case MHNNAUTOSW:
                case MHNDEBUGSW:

-               case MHNEBCDICSW:
-               case MHNNEBCDICSW:

                case MHNHEADSW:
                case MHNNHEADSW:
                case MHNLISTSW:
                case MHNHEADSW:
                case MHNNHEADSW:
                case MHNLISTSW:


@@ -1633,7 +1618,8 @@ static struct swit pickswit[] = {
 void
 pickcmd (char **args)
 {
 void
 pickcmd (char **args)
 {

-    int zerosw = 1, msgp = 0, seqp = 0;
+    int zerosw = 1, msgp = 0;
+    size_t seqp = 0;

     int vecp = 0, hi, lo, msgnum;
     char *cp, buf[BUFSIZ], *msgs[MAXARGS];
     char *seqs[NUMATTRS], *vec[MAXARGS];
     int vecp = 0, hi, lo, msgnum;
     char *cp, buf[BUFSIZ], *msgs[MAXARGS];
     char *seqs[NUMATTRS], *vec[MAXARGS];


@@ -2281,7 +2267,7 @@ showcmd (char **args)
            return;
     seq_setprev (mp);
 
            return;
     seq_setprev (mp);
 

-    if (!nshow && !getenv ("NOMHNPROC"))
+    if (!nshow)

        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
            if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
                proc = showmimeproc;
        for (msgnum = mp->lowsel; msgnum <= mp->hghsel; msgnum++)
            if (is_selected (mp, msgnum) && is_nontext (msgnum)) {
                proc = showmimeproc;


@@ -2366,6 +2352,8 @@ show (int msgnum)
 static int
 eom_action (int c)
 {
 static int
 eom_action (int c)
 {

+    NMH_UNUSED (c);
+

     return (ftell (mhlfp) >= Msgs[mhlnum].m_stop);
 }
 
     return (ftell (mhlfp) >= Msgs[mhlnum].m_stop);
 }