X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;ds=sidebyside;f=uip%2Faliasbr.c;h=d0c193d737752f7142d7b651eb8437f80412f993;hb=81a21a9a97d8633f6d6231e31fdb6e328d0d3ff2;hp=b15865e20c602025f131f8cd95f7e668eefae289;hpb=3c9700d8d045f3ff26ce5dd2a174454dafc14822;p=mmh diff --git a/uip/aliasbr.c b/uip/aliasbr.c index b15865e..d0c193d 100644 --- 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 #include +#include #include #include @@ -47,6 +52,7 @@ struct home *seek_home (char *); #endif +/* Do mh alias substitution on 's' and return the results. */ char * akvalue (char *s) { @@ -470,9 +476,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 +521,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 +542,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;