* man/mhbuild.man: wrapped one appearance of "Content-Disposition"

[mmh] / uip / aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index b15865e..aadd676 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -3,10 +3,15 @@
  * aliasbr.c -- new aliasing mechanism
  *
  * $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/aliasbr.h>
+#include <h/utils.h>
 #include <grp.h>
 #include <pwd.h>
 
@@ -42,11 +47,10 @@ 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. */
 char *
 akvalue (char *s)
 {
@@ -470,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;
@@ -517,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;
@@ -539,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;
@@ -559,7 +559,6 @@ hmalloc (struct passwd *pw)
 }
 
 
-#ifndef        MMDFMTS
 struct home *
 seek_home (char *name)
 {
@@ -596,4 +595,3 @@ seek_home (char *name)
        
     return NULL;
 }
-#endif /* MMDFMTS */