Replace getcpy() with mh_xstrdup().

[nmh] / uip / aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 6600f741374247b7d6aacdb47c0c0260d39277b5..65cd5e445311d94511e54d9a2714db348c172422 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -41,7 +41,6 @@ static char *seekp (char *, char *, char **);
 static int addfile (struct aka *, char *);
 static int addgroup (struct aka *, char *);
 static int addmember (struct aka *, char *);
-static int addall (struct aka *);
 static char *getalias (char *);
 static void add_aka (struct aka *, char *);
 static struct aka *akalloc (char *);
@@ -271,10 +270,6 @@ alias (char *file)
                }
                break;
 
-           case '*':           /* Everyone */
-               addall (ak);
-               break;
-
            default:            /* list */
                while ((cp = getalias (pp)))
                    add_aka (ak, cp);
@@ -439,26 +434,6 @@ addmember (struct aka *ak, char *grp)
 }
 
 
-static int
-addall (struct aka *ak)
-{
-    int noshell = NoShell == NULL || *NoShell == 0;
-    register struct home *hm;
-
-    init_pw ();
-
-    if (Everyone < 0)
-       Everyone = EVERYONE;
-
-    for (hm = homehead; hm; hm = hm->h_next)
-        if ((int) hm->h_uid > Everyone
-               && (noshell || strcmp (hm->h_shell, NoShell)))
-           add_aka (ak, hm->h_name);
-
-    return homehead != NULL;
-}
-
-
 static char *
 getalias (char *addrs)
 {
@@ -503,7 +478,7 @@ add_aka (struct aka *ak, char *pp)
        if (!strcmp (pp, ad->ad_text))
            return;
 
-    ad = (struct adr *) mh_xmalloc (sizeof(*ad));
+    NEW(ad);
     ad->ad_text = getcpy (pp);
     ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
     ad->ad_next = NULL;
@@ -544,8 +519,7 @@ akalloc (char *id)
 {
     register struct aka *p;
 
-    p = (struct aka *) mh_xmalloc (sizeof(*p));
-
+    NEW(p);
     p->ak_name = getcpy (id);
     p->ak_visible = 0;
     p->ak_addr = NULL;
@@ -565,8 +539,7 @@ hmalloc (struct passwd *pw)
 {
     register struct home *p;
 
-    p = (struct home *) mh_xmalloc (sizeof(*p));
-
+    NEW(p);
     p->h_name = getcpy (pw->pw_name);
     p->h_uid = pw->pw_uid;
     p->h_gid = pw->pw_gid;