Added -nocontentid (and -contentid, for symmetry) switch to mhbuild. This allows...

[mmh] / uip / mhshow.c

diff --git a/uip/mhshow.c b/uip/mhshow.c
index 0791c48..909c440 100644 (file)
--- a/uip/mhshow.c
+++ b/uip/mhshow.c
@@ -3,6 +3,10 @@
  * mhshow.c -- display the contents of MIME messages
  *
  * $Id$
+ *
+ * This code is Copyright (c) 2002, by the authors of nmh.  See the
+ * COPYRIGHT file in the root directory of the nmh distribution for
+ * complete copyright information.
  */
 
 #include <h/mh.h>
@@ -11,11 +15,12 @@
 #include <h/md5.h>
 #include <errno.h>
 #include <signal.h>
-#include <zotnet/mts/mts.h>
-#include <zotnet/tws/tws.h>
+#include <h/mts.h>
+#include <h/tws.h>
 #include <h/mime.h>
 #include <h/mhparse.h>
 #include <h/mhcachesbr.h>
+#include <h/utils.h>
 
 #ifdef HAVE_SYS_WAIT_H
 # include <sys/wait.h>
@@ -60,7 +65,7 @@ static struct swit switches[] = {
 #define VERSIONSW              14
     { "version", 0 },
 #define        HELPSW                 15
-    { "help", 4 },
+    { "help", 0 },
 
 /*
  * switches for moreproc/mhlproc
@@ -83,8 +88,6 @@ static struct swit switches[] = {
 };
 
 
-extern int errno;
-
 /* mhparse.c */
 extern int checksw;
 extern char *tmp;      /* directory to place temp files */
@@ -167,8 +170,7 @@ main (int argc, char **argv)
      */
     nummsgs = 0;
     maxmsgs = MAXMSGS;
-    if (!(msgs = (char **) malloc ((size_t) (maxmsgs * sizeof(*msgs)))))
-       adios (NULL, "unable to allocate storage");
+    msgs = (char **) mh_xmalloc ((size_t) (maxmsgs * sizeof(*msgs)));
 
     /*
      * Parse arguments
@@ -303,9 +305,8 @@ do_cache:
             */
            if (nummsgs >= maxmsgs) {
                maxmsgs += MAXMSGS;
-               if (!(msgs = (char **) realloc (msgs,
-                       (size_t) (maxmsgs * sizeof(*msgs)))))
-                   adios (NULL, "unable to reallocate msgs storage");
+               msgs = (char **) mh_xrealloc (msgs,
+                   (size_t) (maxmsgs * sizeof(*msgs)));
            }
            msgs[nummsgs++] = cp;
        }