X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/a3544ffdfac9536a2a115dd7afd805a399083e01..9322ba2854211794c27fae9468768b80b767c211:/sbr/addrsbr.c diff --git a/sbr/addrsbr.c b/sbr/addrsbr.c index a073e707..49953f61 100644 --- a/sbr/addrsbr.c +++ b/sbr/addrsbr.c @@ -11,6 +11,7 @@ #include #include #include +#include /* High level parsing of addresses: @@ -48,7 +49,7 @@ If an explicit host is not present, then MH checks for a bang to indicate an explicit UUCP-style address. If so, this is noted. If not, the host is - defaulted, typically to the local host. The lack of an explict host is + defaulted, typically to the local host. The lack of an explicit host is also noted. If an explicit 822-style host is present, then MH checks to see if it @@ -75,18 +76,24 @@ static char *grp = NULL; static char *note = NULL; static char err[BUFSIZ]; static char adr[BUFSIZ]; +static int eai = 0; + +void +enable_eai() { + eai = 1; +} char * getname (const char *addrs) { struct adrx *ap; - pers = mbox = host = route = grp = note = NULL; err[0] = '\0'; - if ((ap = getadrx (addrs ? addrs : "")) == NULL) + if ((ap = getadrx (addrs ? addrs : "", eai)) == NULL) { return NULL; + } strncpy (adr, ap->text, sizeof(adr)); pers = ap->pers; @@ -104,35 +111,32 @@ getname (const char *addrs) struct mailname * -getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) +getm (char *str, char *dfhost, int dftype, char *eresult, size_t eresultsize) { char *pp; struct mailname *mp; if (err[0]) { - if (eresult) - strcpy (eresult, err); - else - if (wanthost == AD_HOST) - admonish (NULL, "bad address '%s' - %s", str, err); + if (eresult) { + strncpy (eresult, err, eresultsize); + eresult[eresultsize - 1] = '\0'; + } return NULL; } if (pers == NULL && mbox == NULL && host == NULL && route == NULL && grp == NULL) { - if (eresult) - strcpy (eresult, "null address"); - else - if (wanthost == AD_HOST) - admonish (NULL, "null address '%s'", str); + if (eresult) { + strncpy (eresult, "null address", eresultsize); + eresult[eresultsize - 1] = '\0'; + } return NULL; } if (mbox == NULL && grp == NULL) { - if (eresult) - strcpy (eresult, "no mailbox in address"); - else - if (wanthost == AD_HOST) - admonish (NULL, "no mailbox in address '%s'", str); + if (eresult) { + strncpy (eresult, "no mailbox in address", eresultsize); + eresult[eresultsize - 1] = '\0'; + } return NULL; } @@ -141,20 +145,11 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) dftype = LOCALHOST; } - mp = (struct mailname *) calloc ((size_t) 1, sizeof(*mp)); - if (mp == NULL) { - if (eresult) - strcpy (eresult, "insufficient memory to represent address"); - else - if (wanthost == AD_HOST) - adios (NULL, "insufficient memory to represent address"); - return NULL; - } - + NEW0(mp); mp->m_next = NULL; mp->m_text = getcpy (str); if (pers) - mp->m_pers = getcpy (pers); + mp->m_pers = mh_xstrdup(pers); if (mbox == NULL) { mp->m_type = BADHOST; @@ -162,19 +157,19 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) mp->m_ingrp = ingrp; mp->m_gname = getcpy (grp); if (note) - mp->m_note = getcpy (note); + mp->m_note = mh_xstrdup(note); return mp; } if (host) { mp->m_mbox = getcpy (mbox); - mp->m_host = getcpy (host); + mp->m_host = mh_xstrdup(host); mp->m_type = strcasecmp (LocalName(0), mp->m_host) ? NETHOST : LOCALHOST; } else { if ((pp = strchr(mbox, '!'))) { *pp++ = '\0'; - mp->m_mbox = getcpy (pp); + mp->m_mbox = mh_xstrdup(pp); mp->m_host = getcpy (mbox); mp->m_type = UUCPHOST; } else { @@ -194,12 +189,12 @@ getm (char *str, char *dfhost, int dftype, int wanthost, char *eresult) to support wild-card matching. */ if (route) - mp->m_path = getcpy (route); + mp->m_path = mh_xstrdup(route); mp->m_ingrp = ingrp; if (grp) - mp->m_gname = getcpy (grp); + mp->m_gname = mh_xstrdup(grp); if (note) - mp->m_note = getcpy (note); + mp->m_note = mh_xstrdup(note); return mp; } @@ -211,22 +206,15 @@ mnfree (struct mailname *mp) if (!mp) return; - if (mp->m_text) - free (mp->m_text); - if (mp->m_pers) - free (mp->m_pers); - if (mp->m_mbox) - free (mp->m_mbox); - if (mp->m_host) - free (mp->m_host); - if (mp->m_path) - free (mp->m_path); - if (mp->m_gname) - free (mp->m_gname); - if (mp->m_note) - free (mp->m_note); - - free ((char *) mp); + mh_xfree(mp->m_text); + mh_xfree(mp->m_pers); + mh_xfree(mp->m_mbox); + mh_xfree(mp->m_host); + mh_xfree(mp->m_path); + mh_xfree(mp->m_gname); + mh_xfree(mp->m_note); + + free(mp); } @@ -242,10 +230,13 @@ auxformat (struct mailname *mp, int extras) strncpy (addr, mp->m_mbox ? mp->m_mbox : "", sizeof(addr)); else - if (mp->m_type != UUCPHOST) - snprintf (addr, sizeof(addr), mp->m_host ? "%s%s@%s" : "%s%s", - empty(mp->m_path), empty(mp->m_mbox), mp->m_host); - else + if (mp->m_type != UUCPHOST) { + if (mp->m_host) + snprintf (addr, sizeof(addr), "%s%s@%s", empty(mp->m_path), + empty(mp->m_mbox), mp->m_host); + else snprintf (addr, sizeof(addr), "%s%s", empty(mp->m_path), + empty(mp->m_mbox)); + } else snprintf (addr, sizeof(addr), "%s!%s", mp->m_host, mp->m_mbox); if (!extras) @@ -288,9 +279,9 @@ int ismymbox (struct mailname *np) { int oops; - register int len, i; - register char *cp; - register char *pp; + int len, i; + char *cp; + char *pp; char buffer[BUFSIZ]; struct mailname *mp; static char *am = NULL; @@ -314,7 +305,7 @@ ismymbox (struct mailname *np) return 0; } - if ((mq.m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) { + if ((mq.m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) { admonish (NULL, "invalid entry in local-mailbox: %s", cp); return 0; } @@ -334,7 +325,7 @@ ismymbox (struct mailname *np) mp = mq.m_next ? mq.m_next : &mq; oops = 0; while ((cp = getname (am))) { - if ((mp->m_next = getm (cp, NULL, 0, AD_NAME, NULL)) == NULL) { + if ((mp->m_next = getm (cp, NULL, 0, NULL, 0)) == NULL) { admonish (NULL, "illegal address: %s", cp); oops++; } else { @@ -394,7 +385,8 @@ ismymbox (struct mailname *np) case UUCPHOST: if (strcasecmp (np->m_host, SystemName())) - break; /* fall */ + break; + /* FALLTHRU */ case LOCALHOST: local_test: ; if (!strcasecmp (np->m_mbox, mq.m_mbox)) @@ -412,7 +404,8 @@ local_test: ; for (mp = &mq; mp->m_next;) { mp = mp->m_next; if (!np->m_mbox) - continue; if ((len = strlen (cp = np->m_mbox)) + continue; + if ((len = strlen (cp = np->m_mbox)) < (i = strlen (pp = mp->m_mbox))) continue; switch (mp->m_type & W_MBOX) { @@ -436,7 +429,7 @@ local_test: ; if (mp->m_nohost) return 1; - if (np->m_host == NULL) + if (np->m_host == NULL || mp->m_host == NULL) continue; if ((len = strlen (cp = np->m_host)) < (i = strlen (pp = mp->m_host)))