X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=uip%2Fconflict.c;h=50971199d202c293f5a105b6a94f92661a925ea6;hp=1a921cdce7f0e6b1104a6595faf9ecaf8fe191ca;hb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2;hpb=197f95940cc0860683e6988352f721e6603f9339

diff --git a/uip/conflict.c b/uip/conflict.c
index 1a921cd..5097119 100644
--- a/uip/conflict.c
+++ b/uip/conflict.c
@@ -3,12 +3,17 @@
  * conflict.c -- check for conflicts in mail system
  *
  * $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 <fcntl.h>
 #include <h/aliasbr.h>
-#include <zotnet/mts/mts.h>
+#include <h/mts.h>
+#include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -31,7 +36,7 @@ static struct swit switches[] = {
 #define VERSIONSW      2
     { "version", 0 },
 #define	HELPSW         3
-    { "help", 4 },
+    { "help", 0 },
     { NULL, 0 }
 };
 
@@ -185,8 +190,7 @@ grp_names (void)
     /* allocate space NGRPS at a time */
     numgroups = 0;
     maxgroups = NGRPS;
-    if (!(grps = (char **) malloc((size_t) (maxgroups * sizeof(*grps)))))
-	adios (NULL, "unable to allocate group name storage");
+    grps = (char **) mh_xmalloc((size_t) (maxgroups * sizeof(*grps)));
 
     setgrent ();
     while ((gr = getgrent ())) {