X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fmhn.c;h=685a74e7759ddde5600481a354e7d4a86800ae9a;hp=f73853e465d2304cadbb851d6bf11cbdffffd73c;hb=1bb1f6c3f38b05060bf699ea2743f7386889bf63;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822

diff --git a/uip/mhn.c b/uip/mhn.c
index f73853e..685a74e 100644
--- a/uip/mhn.c
+++ b/uip/mhn.c
@@ -3,6 +3,10 @@
  * mhn.c -- display, list, cache, or store 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>
@@ -88,7 +93,7 @@ static struct swit switches[] = {
 #define VERSIONSW              28
     { "version", 0 },
 #define	HELPSW                 29
-    { "help", 4 },
+    { "help", 0 },
 
 /*
  * switches for debugging
@@ -127,8 +132,6 @@ static struct swit switches[] = {
 };
 
 
-extern int errno;
-
 /* mhparse.c */
 extern int checksw;
 extern char *tmp;	/* directory to place temp files */
@@ -240,8 +243,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
@@ -447,9 +449,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;
 	}