mhlist, mhbuild: Always evaluate realsizes of the MIME parts.

[mmh] / uip / mhbuild.c

diff --git a/uip/mhbuild.c b/uip/mhbuild.c
index d22e455..cc319f5 100644 (file)
--- a/uip/mhbuild.c
+++ b/uip/mhbuild.c
@@ -41,27 +41,23 @@ static struct swit switches[] = {
        { "list", 0 },
 #define NLISTSW  5
        { "nolist", 0 },
-#define SIZESW  6
-       { "realsize", 0 },
-#define NSIZESW  7
-       { "norealsize", 0 },
-#define RFC934SW  8
+#define RFC934SW  6
        { "rfc934mode", 0 },
-#define NRFC934SW  9
+#define NRFC934SW  7
        { "norfc934mode", 0 },
-#define VERBSW  10
+#define VERBSW  8
        { "verbose", 0 },
-#define NVERBSW  11
+#define NVERBSW  9
        { "noverbose", 0 },
-#define CONTENTIDSW  12
+#define CONTENTIDSW  10
        { "contentid", 0 },
-#define NCONTENTIDSW  13
+#define NCONTENTIDSW  11
        { "nocontentid", 0 },
-#define VERSIONSW  14
+#define VERSIONSW  12
        { "version", 0 },
-#define HELPSW  15
+#define HELPSW  13
        { "help", 0 },
-#define DEBUGSW  16
+#define DEBUGSW  14
        { "debug", -5 },
        { NULL, 0 }
 };
@@ -128,7 +124,7 @@ int output_message(CT, char *);
 int output_message_fp(CT, FILE *, char*);
 
 /* mhlistsbr.c */
-int list_all_messages(CT *, int, int, int, int);
+int list_all_messages(CT *, int, int, int);
 
 /* mhmisc.c */
 void set_endian(void);
@@ -140,7 +136,7 @@ void free_content(CT);
 int
 main(int argc, char **argv)
 {
-       int sizesw = 1, headsw = 1;
+       int headsw = 1;
        char *cp, buf[BUFSIZ];
        char buffer[BUFSIZ], *compfile = NULL;
        char **argp, **arguments;
@@ -215,13 +211,6 @@ main(int argc, char **argv)
                                rfc934sw = 0;
                                continue;
 
-                       case SIZESW:
-                               sizesw++;
-                               continue;
-                       case NSIZESW:
-                               sizesw = 0;
-                               continue;
-
                        case CONTENTIDSW:
                                contentidsw = 1;
                                continue;
@@ -352,7 +341,7 @@ main(int argc, char **argv)
        ** List the message info
        */
        if (listsw)
-               list_all_messages(cts, headsw, sizesw, verbosw, debugsw);
+               list_all_messages(cts, headsw, verbosw, debugsw);
 
        /* Rename composition draft */
        snprintf(buffer, sizeof(buffer), "%s.orig", m_backup(compfile));