X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e6bb9ec43b332fd1a4b0faddbe3c9f2f2ee80dde..0f654f924e450f12fda24775cd51cdcc2b41b516:/uip/aliasbr.c diff --git a/uip/aliasbr.c b/uip/aliasbr.c index 49372510..40687bbc 100644 --- a/uip/aliasbr.c +++ b/uip/aliasbr.c @@ -1,6 +1,4 @@ - -/* - * aliasbr.c -- new aliasing mechanism +/* aliasbr.c -- new aliasing mechanism * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for @@ -11,7 +9,6 @@ #include #include #include -#include #include static int akvis; @@ -20,39 +17,25 @@ static char *akerrst; struct aka *akahead = NULL; struct aka *akatail = NULL; -struct home *homehead = NULL; -struct home *hometail = NULL; - /* * prototypes */ -int alias (char *); -int akvisible (void); -void init_pw (void); -char *akresult (struct aka *); -char *akvalue (char *); -char *akerror (int); - static char *akval (struct aka *, char *); -static int aleq (char *, char *); -static char *scanp (unsigned 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 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 struct home *hmalloc (struct passwd *); /* Do mh alias substitution on 's' and return the results. */ char * akvalue (char *s) { - register char *v; + char *v; if (akahead == NULL) alias (AliasFile); @@ -75,8 +58,8 @@ akvisible (void) 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) @@ -104,10 +87,18 @@ akval (struct aka *ak, char *s) 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); - } else if (strchr (s, ':')) { + } + + if (strchr (s, ':')) { /* The first address in a blind list will contain the alias name, so try to match, but just with just the address (not including the list name). If there's a @@ -120,11 +111,13 @@ akval (struct aka *ak, char *s) 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); + char *gname = mh_xstrdup(FENDNULL(mp->m_gname)); + /* FIXME: gname must be true; add() never returns NULL. + * Is some other test required? */ if (gname && aleq (name, ak->ak_name)) { /* Will leak cp. */ cp = concat (gname, akresult (ak), NULL); @@ -144,25 +137,24 @@ akval (struct aka *ak, char *s) } } - return getcpy (s); + return mh_xstrdup(s); } -static int +static bool aleq (char *string, char *aliasent) { - register char c; + char c; - while ((c = *string++)) + while ((c = *string++)) { if (*aliasent == '*') - return 1; - else - if ((c | 040) != (*aliasent | 040)) - return 0; - else - aliasent++; + return true; + if (tolower((unsigned char)c) != tolower((unsigned char)*aliasent)) + return false; + aliasent++; + } - return (*aliasent == 0 || *aliasent == '*'); + return *aliasent == 0 || *aliasent == '*'; } @@ -170,13 +162,13 @@ int alias (char *file) { int i; - register char *bp, *cp, *pp; + char *bp, *cp, *pp; 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))) + && !has_prefix(file, "./") && !has_prefix(file, "../")) file = etcpath (file); if ((fp = fopen (file, "r")) == NULL) { akerrst = file; @@ -196,7 +188,7 @@ alias (char *file) fclose (fp); return i; } - + continue; case ':': /* comment */ case ';': case '#': @@ -215,11 +207,11 @@ alias (char *file) } switch (lc) { case ':': - ak->ak_visible = 0; + ak->ak_visible = false; break; case ';': - ak->ak_visible = 1; + ak->ak_visible = true; break; default: @@ -243,32 +235,6 @@ alias (char *file) } break; - case '=': /* UNIX group */ - if (!*(cp = getp (pp + 1))) { - fclose (fp); - return AK_ERROR; - } - if (!addgroup (ak, cp)) { - fclose (fp); - return AK_NOGROUP; - } - break; - - case '+': /* UNIX group members */ - if (!*(cp = getp (pp + 1))) { - fclose (fp); - return AK_ERROR; - } - if (!addmember (ak, cp)) { - fclose (fp); - return AK_NOGROUP; - } - break; - - case '*': /* Everyone */ - addall (ak); - break; - default: /* list */ while ((cp = getalias (pp))) add_aka (ak, cp); @@ -299,10 +265,6 @@ akerror (int i) snprintf (buffer, sizeof(buffer), "out of memory while on '%s'", akerrst); break; - case AK_NOGROUP: - snprintf (buffer, sizeof(buffer), "no such group as '%s'", akerrst); - break; - default: snprintf (buffer, sizeof(buffer), "unknown error (%d)", i); break; @@ -313,9 +275,9 @@ akerror (int i) static char * -scanp (unsigned char *p) +scanp (char *p) { - while (isspace (*p)) + while (isspace ((unsigned char) *p)) p++; return p; } @@ -324,10 +286,10 @@ scanp (unsigned char *p) static char * getp (char *p) { - register unsigned char *cp = scanp (p); + char *cp = scanp (p); p = cp; - while (!isspace (*cp) && *cp) + while (!isspace ((unsigned char) *cp) && *cp) cp++; *cp = 0; @@ -338,10 +300,10 @@ getp (char *p) static char * seekp (char *p, char *c, char **a) { - register unsigned char *cp; + char *cp; p = cp = scanp (p); - while (!isspace (*cp) && *cp && *cp != ':' && *cp != ';') + while (!isspace ((unsigned char) *cp) && *cp && *cp != ':' && *cp != ';') cp++; *c = *cp; *cp++ = 0; @@ -354,9 +316,9 @@ seekp (char *p, char *c, char **a) static int addfile (struct aka *ak, char *file) { - register char *cp; + char *cp; char buffer[BUFSIZ]; - register FILE *fp; + FILE *fp; if (!(fp = fopen (etcpath (file), "r"))) { akerrst = file; @@ -372,104 +334,22 @@ addfile (struct aka *ak, char *file) } -static int -addgroup (struct aka *ak, char *grp) -{ - register char *gp; - register struct group *gr = getgrnam (grp); - register struct home *hm = NULL; - - if (!gr) - gr = getgrgid (atoi (grp)); - if (!gr) { - akerrst = grp; - return 0; - } - - while ((gp = *gr->gr_mem++)) - { - struct passwd *pw; - for (hm = homehead; hm; hm = hm->h_next) - if (!strcmp (hm->h_name, gp)) { - add_aka (ak, hm->h_name); - break; - } - if ((pw = getpwnam(gp))) - { - hmalloc(pw); - add_aka (ak, gp); - } - } - - return 1; -} - - -static int -addmember (struct aka *ak, char *grp) -{ - gid_t gid; - register struct group *gr = getgrnam (grp); - register struct home *hm = NULL; - - if (gr) - gid = gr->gr_gid; - else { - gid = atoi (grp); - gr = getgrgid (gid); - } - if (!gr) { - akerrst = grp; - return 0; - } - - init_pw (); - - for (hm = homehead; hm; hm = hm->h_next) - if (hm->h_gid == gid) - add_aka (ak, hm->h_name); - - return 1; -} - - -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) { - register unsigned char *pp, *qp; + char *pp, *qp; static char *cp = NULL; if (cp == NULL) cp = addrs; - else - if (*cp == 0) - return (cp = NULL); + else if (*cp == 0) + return cp = NULL; /* Remove leading any space from the address. */ - for (pp = cp; isspace (*pp); pp++) + 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; @@ -478,7 +358,7 @@ getalias (char *addrs) *qp++ = 0; for (cp = qp, qp--; qp > pp; qp--) if (*qp != 0) { - if (isspace (*qp)) + if (isspace ((unsigned char) *qp)) *qp = 0; else break; @@ -491,14 +371,14 @@ getalias (char *addrs) 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; - 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) @@ -508,40 +388,14 @@ add_aka (struct aka *ak, char *pp) } -void -init_pw (void) -{ - register struct passwd *pw; - static int init; - - if (!init) - { - /* if the list has yet to be initialized */ - /* zap the list, and rebuild from scratch */ - homehead=NULL; - hometail=NULL; - init++; - - setpwent (); - - while ((pw = getpwent ())) - if (!hmalloc (pw)) - break; - - endpwent (); - } -} - - 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_visible = false; p->ak_addr = NULL; p->ak_next = NULL; if (akatail != NULL) @@ -552,27 +406,3 @@ akalloc (char *id) return p; } - - -static struct home * -hmalloc (struct passwd *pw) -{ - register struct home *p; - - p = (struct home *) mh_xmalloc (sizeof(*p)); - - p->h_name = getcpy (pw->pw_name); - p->h_uid = pw->pw_uid; - p->h_gid = pw->pw_gid; - p->h_home = getcpy (pw->pw_dir); - p->h_shell = getcpy (pw->pw_shell); - p->h_ngrps = 0; - p->h_next = NULL; - if (hometail != NULL) - hometail->h_next = p; - if (homehead == NULL) - homehead = p; - hometail = p; - - return p; -}