Use LEN() on string constants instead of strlen().

[nmh] / uip / aliasbr.c

diff --git a/uip/aliasbr.c b/uip/aliasbr.c
index a696e8a6406607eee4e38c67d9abdcb1f07b45c3..039344165e22ed57f15d3bbc378b5bb8c711f380 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 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 *);
 static char *getalias (char *);
 static void add_aka (struct aka *, char *);
 static struct aka *akalloc (char *);


@@ -52,7 +51,7 @@ static struct home *hmalloc (struct passwd *);
 char *
 akvalue (char *s)
 {
 char *
 akvalue (char *s)
 {

-    register char *v;
+    char *v;

 
     if (akahead == NULL)
        alias (AliasFile);
 
     if (akahead == NULL)
        alias (AliasFile);


@@ -75,8 +74,8 @@ akvisible (void)
 char *
 akresult (struct aka *ak)
 {
 char *
 akresult (struct aka *ak)
 {

-    register char *cp = NULL, *dp, *pp;
-    register struct adr *ad;
+    char *cp = NULL, *dp, *pp;
+    struct adr *ad;

 
     for (ad = ak->ak_addr; ad; ad = ad->ad_next) {
        pp = ad->ad_local ? akval (ak->ak_next, ad->ad_text)
 
     for (ad = ak->ak_addr; ad; ad = ad->ad_next) {
        pp = ad->ad_local ? akval (ak->ak_next, ad->ad_text)


@@ -104,6 +103,12 @@ akval (struct aka *ak, char *s)
     if (!s)
        return s;                       /* XXX */
 
     if (!s)
        return s;                       /* XXX */
 

+    /* It'd be tempting to check for a trailing semicolon and remove
+       it.  But that would break the EXMH alias parser on what would
+       then be valid expressions:
+       http://lists.gnu.org/archive/html/nmh-workers/2012-10/msg00039.html
+     */
+

     for (; ak; ak = ak->ak_next) {
        if (aleq (s, ak->ak_name)) {
            return akresult (ak);
     for (; ak; ak = ak->ak_next) {
        if (aleq (s, ak->ak_name)) {
            return akresult (ak);


@@ -120,7 +125,7 @@ akval (struct aka *ak, char *s)
            if (name) {
                /* s is of the form "Blind list: address".  If address
                   is an alias, expand it. */
            if (name) {
                /* s is of the form "Blind list: address".  If address
                   is an alias, expand it. */

-               struct mailname *mp = getm (name, NULL, 0, AD_NAME, NULL);
+               struct mailname *mp = getm (name, NULL, 0, NULL, 0);

 
                if (mp  &&  mp->m_ingrp) {
                    char *gname = add (mp->m_gname, NULL);
 
                if (mp  &&  mp->m_ingrp) {
                    char *gname = add (mp->m_gname, NULL);


@@ -144,14 +149,14 @@ akval (struct aka *ak, char *s)
        }
     }
 
        }
     }
 

-    return getcpy (s);
+    return mh_xstrdup(s);

 }
 
 
 static int
 aleq (char *string, char *aliasent)
 {
 }
 
 
 static int
 aleq (char *string, char *aliasent)
 {

-    register char c;
+    char c;

 
     while ((c = *string++))
        if (*aliasent == '*')
 
     while ((c = *string++))
        if (*aliasent == '*')


@@ -170,10 +175,10 @@ int
 alias (char *file)
 {
     int i;
 alias (char *file)
 {
     int i;

-    register char *bp, *cp, *pp;
+    char *bp, *cp, *pp;

     char lc, *ap;
     char lc, *ap;

-    register struct aka *ak = NULL;
-    register FILE *fp;
+    struct aka *ak = NULL;
+    FILE *fp;

 
     if (*file != '/'
            && (strncmp (file, "./", 2) && strncmp (file, "../", 3)))
 
     if (*file != '/'
            && (strncmp (file, "./", 2) && strncmp (file, "../", 3)))


@@ -265,10 +270,6 @@ alias (char *file)
                }
                break;
 
                }
                break;
 

-           case '*':           /* Everyone */
-               addall (ak);
-               break;
-

            default:            /* list */
                while ((cp = getalias (pp)))
                    add_aka (ak, cp);
            default:            /* list */
                while ((cp = getalias (pp)))
                    add_aka (ak, cp);


@@ -354,9 +355,9 @@ seekp (char *p, char *c, char **a)
 static int
 addfile (struct aka *ak, char *file)
 {
 static int
 addfile (struct aka *ak, char *file)
 {

-    register char *cp;
+    char *cp;

     char buffer[BUFSIZ];
     char buffer[BUFSIZ];

-    register FILE *fp;
+    FILE *fp;

 
     if (!(fp = fopen (etcpath (file), "r"))) {
        akerrst = file;
 
     if (!(fp = fopen (etcpath (file), "r"))) {
        akerrst = file;


@@ -375,9 +376,9 @@ addfile (struct aka *ak, char *file)
 static int
 addgroup (struct aka *ak, char *grp)
 {
 static int
 addgroup (struct aka *ak, char *grp)
 {

-    register char *gp;
-    register struct group *gr = getgrnam (grp);
-    register struct home *hm = NULL;
+    char *gp;
+    struct group *gr = getgrnam (grp);
+    struct home *hm = NULL;

 
     if (!gr)
        gr = getgrgid (atoi (grp));
 
     if (!gr)
        gr = getgrgid (atoi (grp));


@@ -409,8 +410,8 @@ static int
 addmember (struct aka *ak, char *grp)
 {
     gid_t gid;
 addmember (struct aka *ak, char *grp)
 {
     gid_t gid;

-    register struct group *gr = getgrnam (grp);
-    register struct home *hm = NULL;
+    struct group *gr = getgrnam (grp);
+    struct home *hm = NULL;

 
     if (gr)
        gid = gr->gr_gid;
 
     if (gr)
        gid = gr->gr_gid;


@@ -433,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)
 {
 static char *
 getalias (char *addrs)
 {


@@ -491,14 +472,14 @@ getalias (char *addrs)
 static void
 add_aka (struct aka *ak, char *pp)
 {
 static void
 add_aka (struct aka *ak, char *pp)
 {

-    register struct adr *ad, *ld;
+    struct adr *ad, *ld;

 
     for (ad = ak->ak_addr, ld = NULL; ad; ld = ad, ad = ad->ad_next)
        if (!strcmp (pp, ad->ad_text))
            return;
 
 
     for (ad = ak->ak_addr, ld = NULL; ad; ld = ad, ad = ad->ad_next)
        if (!strcmp (pp, ad->ad_text))
            return;
 

-    ad = (struct adr *) mh_xmalloc (sizeof(*ad));
-    ad->ad_text = getcpy (pp);
+    NEW(ad);
+    ad->ad_text = mh_xstrdup(pp);

     ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
     ad->ad_next = NULL;
     if (ak->ak_addr)
     ad->ad_local = strchr(pp, '@') == NULL && strchr(pp, '!') == NULL;
     ad->ad_next = NULL;
     if (ak->ak_addr)


@@ -511,7 +492,7 @@ add_aka (struct aka *ak, char *pp)
 void
 init_pw (void)
 {
 void
 init_pw (void)
 {

-    register struct passwd  *pw;
+    struct passwd  *pw;

     static int init;
   
     if (!init)
     static int init;
   
     if (!init)


@@ -536,10 +517,9 @@ init_pw (void)
 static struct aka *
 akalloc (char *id)
 {
 static struct aka *
 akalloc (char *id)
 {

-    register struct aka *p;
-
-    p = (struct aka *) mh_xmalloc (sizeof(*p));
+    struct aka *p;

 
 

+    NEW(p);

     p->ak_name = getcpy (id);
     p->ak_visible = 0;
     p->ak_addr = NULL;
     p->ak_name = getcpy (id);
     p->ak_visible = 0;
     p->ak_addr = NULL;


@@ -557,10 +537,9 @@ akalloc (char *id)
 static struct home *
 hmalloc (struct passwd *pw)
 {
 static struct home *
 hmalloc (struct passwd *pw)
 {

-    register struct home *p;
-
-    p = (struct home *) mh_xmalloc (sizeof(*p));
+    struct home *p;

 
 

+    NEW(p);

     p->h_name = getcpy (pw->pw_name);
     p->h_uid = pw->pw_uid;
     p->h_gid = pw->pw_gid;
     p->h_name = getcpy (pw->pw_name);
     p->h_uid = pw->pw_uid;
     p->h_gid = pw->pw_gid;