X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Frcvdist.c;h=e8815653e7713170d3d4a1c15dd3c22dfad8076d;hp=5fca8ec50433760e31b6dc78ceee278cbf0bd2e6;hb=d2f12554a254e814dcdafb3828fc0d9936154eef;hpb=8563731b02ce9d750806f6b1769af8b399d964e8

diff --git a/uip/rcvdist.c b/uip/rcvdist.c
index 5fca8ec..e881565 100644
--- a/uip/rcvdist.c
+++ b/uip/rcvdist.c
@@ -3,13 +3,18 @@
  * rcvdist.c -- asynchronously redistribute 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>
 #include <h/fmt_scan.h>
 #include <h/rcvmail.h>
-#include <zotnet/tws/tws.h>
-#include <zotnet/mts/mts.h>
+#include <h/tws.h>
+#include <h/mts.h>
+#include <h/utils.h>
 
 static struct swit switches[] = {
 #define	FORMSW       0
@@ -17,7 +22,7 @@ static struct swit switches[] = {
 #define VERSIONSW    1
     { "version", 0 },
 #define	HELPSW       2
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -177,8 +182,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
     *--savecomp = 0;
 
     for (i = ncomps; i--;)
-	if (!(*nxtbuf++ = malloc (SBUFSIZ)))
-	    adios (NULL, "unable to allocate component buffer");
+	*nxtbuf++ = mh_xmalloc (SBUFSIZ);
     nxtbuf = compbuffers;
     tmpbuf = *nxtbuf++;
 
@@ -198,7 +202,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 	    case FLDPLUS: 
 		if ((cptr = wantcomp[CHASH (name)]))
 		    do {
-			if (!strcasecmp (name, cptr->c_name)) {
+			if (!mh_strcasecmp (name, cptr->c_name)) {
 			    char_read += msg_count;
 			    if (!cptr->c_text) {
 				cptr->c_text = tmpbuf;
@@ -244,7 +248,7 @@ rcvdistout (FILE *inb, char *form, char *addrs)
 finished: ;
 
     i = format_len + char_read + 256;
-    scanl = malloc ((size_t) i + 2);
+    scanl = mh_xmalloc ((size_t) i + 2);
     dat[0] = dat[1] = dat[2] = dat[4] = 0;
     dat[3] = outputlinelen;
     fmt_scan (fmt, scanl, i, dat);