Support command issuance and timestamps.

[nmh] / uip / aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index 1376cad7eaada9724c26d913d092e2c73ea972f2..40687bbc846a143cc1e26702063b8f87b25420b2 100644 (file)
--- a/uip/aliasbr.c
+++ b/uip/aliasbr.c
@@ -20,15 +20,9 @@ struct aka *akatail = NULL;
 /*
  * prototypes
  */
 /*
  * prototypes
  */

-int alias (char *);
-int akvisible (void);
-char *akresult (struct aka *);
-char *akvalue (char *);
-char *akerror (int);
-

 static  char *akval (struct aka *, char *);
 static  char *akval (struct aka *, char *);

-static bool aleq (char *, char *);
-static char *scanp (char *);
+static bool aleq (char *, char *) PURE;
+static char *scanp (char *) PURE;

 static char *getp (char *);
 static char *seekp (char *, char *, char **);
 static int addfile (struct aka *, char *);
 static char *getp (char *);
 static char *seekp (char *, char *, char **);
 static int addfile (struct aka *, char *);


@@ -120,7 +114,7 @@ akval (struct aka *ak, char *s)
                struct mailname *mp = getm (name, NULL, 0, NULL, 0);
 
                if (mp  &&  mp->m_ingrp) {
                struct mailname *mp = getm (name, NULL, 0, NULL, 0);
 
                if (mp  &&  mp->m_ingrp) {

-                   char *gname = add (mp->m_gname, NULL);
+                   char *gname = mh_xstrdup(FENDNULL(mp->m_gname));

 
                     /* FIXME: gname must be true;  add() never returns NULL.
                     * Is some other test required? */
 
                     /* FIXME: gname must be true;  add() never returns NULL.
                     * Is some other test required? */


@@ -160,7 +154,7 @@ aleq (char *string, char *aliasent)
         aliasent++;
     }
 
         aliasent++;
     }
 

-    return (*aliasent == 0 || *aliasent == '*');
+    return *aliasent == 0 || *aliasent == '*';

 }
 
 
 }
 
 


@@ -349,13 +343,13 @@ getalias (char *addrs)
     if (cp == NULL)
        cp = addrs;
     else if (*cp == 0)
     if (cp == NULL)
        cp = addrs;
     else if (*cp == 0)

-        return (cp = NULL);
+        return cp = NULL;

 
     /* Remove leading any space from the address. */
     for (pp = cp; isspace ((unsigned char) *pp); pp++)
        continue;
     if (*pp == 0)
 
     /* Remove leading any space from the address. */
     for (pp = cp; isspace ((unsigned char) *pp); pp++)
        continue;
     if (*pp == 0)

-       return (cp = NULL);
+       return cp = NULL;

     /* Find the end of the address. */
     for (qp = pp; *qp != 0 && *qp != ','; qp++)
        continue;
     /* Find the end of the address. */
     for (qp = pp; *qp != 0 && *qp != ','; qp++)
        continue;