X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/6c42153ad9362cc676ea66563bf400d7511b3b68..1524cb8c0b86a854149d7859d6a2503d61dbaa36:/uip/aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 19f204fa..af3827ba 100644
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -11,6 +11,7 @@
 
 #include <h/mh.h>
 #include <h/aliasbr.h>
+#include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -46,9 +47,7 @@ static char *getalias (char *);
 static void add_aka (struct aka *, char *);
 static struct aka *akalloc (char *);
 static struct home *hmalloc (struct passwd *);
-#ifndef MMDFMTS
 struct home *seek_home (char *);
-#endif
 
 
 /* Do mh alias substitution on 's' and return the results. */
@@ -475,9 +474,7 @@ add_aka (struct aka *ak, char *pp)
 	if (!strcmp (pp, ad->ad_text))
 	    return;
 
-    ad = (struct adr *) malloc (sizeof(*ad));
-    if (ad == NULL)
-	return;
+    ad = (struct adr *) mh_xmalloc (sizeof(*ad));
     ad->ad_text = getcpy (pp);
     ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
     ad->ad_next = NULL;
@@ -522,8 +519,7 @@ akalloc (char *id)
 {
     register struct aka *p;
 
-    if (!(p = (struct aka *) malloc (sizeof(*p))))
-	return NULL;
+    p = (struct aka *) mh_xmalloc (sizeof(*p));
 
     p->ak_name = getcpy (id);
     p->ak_visible = 0;
@@ -544,8 +540,7 @@ hmalloc (struct passwd *pw)
 {
     register struct home *p;
 
-    if (!(p = (struct home *) malloc (sizeof(*p))))
-	return NULL;
+    p = (struct home *) mh_xmalloc (sizeof(*p));
 
     p->h_name = getcpy (pw->pw_name);
     p->h_uid = pw->pw_uid;
@@ -564,7 +559,6 @@ hmalloc (struct passwd *pw)
 }
 
 
-#ifndef	MMDFMTS
 struct home *
 seek_home (char *name)
 {
@@ -580,7 +574,7 @@ seek_home (char *name)
 #endif /* DBMPWD */
 
     for (hp = homehead; hp; hp = hp->h_next)
-	if (!strcasecmp (name, hp->h_name))
+	if (!mh_strcasecmp (name, hp->h_name))
 	    return hp;
 
 #ifdef DBMPWD
@@ -601,4 +595,3 @@ seek_home (char *name)
 	
     return NULL;
 }
-#endif	/* MMDFMTS */