X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/0ea1e09365a5fc1d401a6a7df4e2278820c09d23..2b60a54adb3b0bf5a9b927708085492b816a6015:/sbr/mf.c diff --git a/sbr/mf.c b/sbr/mf.c index fa281766..86104de2 100644 --- a/sbr/mf.c +++ b/sbr/mf.c @@ -1,12 +1,11 @@ - -/* - * mf.c -- mail filter subroutines +/* mf.c -- mail filter subroutines * * This code is Copyright (c) 2002, by the authors of nmh. See the * COPYRIGHT file in the root directory of the nmh distribution for * complete copyright information. */ +#include #include #include @@ -23,40 +22,13 @@ static int route (char *); static int my_lex (char *); -int -isfrom(const char *string) -{ - return (strncmp (string, "From ", 5) == 0 - || strncmp (string, ">From ", 6) == 0); -} - - -int -lequal (const char *a, const char *b) -{ - for (; *a; a++, b++) - if (*b == 0) - return FALSE; - else { - char c1 = islower ((unsigned char) *a) ? - toupper ((unsigned char) *a) : *a; - char c2 = islower ((unsigned char) *b) ? - toupper ((unsigned char) *b) : *b; - if (c1 != c2) - return FALSE; - } - - return (*b == 0); -} - - static int isat (const char *p) { - return (strncmp (p, " AT ", 4) - && strncmp (p, " At ", 4) - && strncmp (p, " aT ", 4) - && strncmp (p, " at ", 4) ? FALSE : TRUE); + return *p == ' ' && + (p[1] == 'a' || p[1] == 'A') && + (p[2] == 't' || p[2] == 'T') && + p[3] == ' '; } @@ -118,8 +90,6 @@ isat (const char *p) * */ -#define QUOTE '\\' - #define LX_END 0 #define LX_ERR 1 #define LX_ATOM 2 @@ -148,7 +118,7 @@ static struct specials special[] = { { '@', LX_AT }, { '(', LX_ERR }, { ')', LX_ERR }, - { QUOTE, LX_ERR }, + { '\\', LX_ERR }, { '"', LX_ERR }, { '[', LX_ERR }, { ']', LX_ERR }, @@ -165,7 +135,7 @@ static char *ap = NULL; static char *pers = NULL; static char *mbox = NULL; static char *host = NULL; -static char *path = NULL; +static char *routepath = NULL; static char *grp = NULL; static char *note = NULL; static char err[BUFSIZ]; @@ -178,83 +148,51 @@ static struct adrx adrxs2; struct adrx * getadrx (const char *addrs, int eai) { + int parse; char *bp; struct adrx *adrxp = &adrxs2; - if (pers) - free (pers); - if (mbox) - free (mbox); - if (host) - free (host); - if (path) - free (path); - if (grp) - free (grp); - if (note) - free (note); - pers = mbox = host = path = grp = note = NULL; + mh_xfree(pers); + mh_xfree(mbox); + mh_xfree(host); + mh_xfree(routepath); + mh_xfree(grp); + mh_xfree(note); + pers = mbox = host = routepath = grp = note = NULL; err[0] = 0; if (dp == NULL) { - dp = cp = strdup (addrs ? addrs : ""); + dp = cp = strdup (FENDNULL(addrs)); glevel = 0; + } else if (cp == NULL) { + free (dp); + dp = NULL; + return NULL; } - else - if (cp == NULL) { - free (dp); - dp = NULL; - return NULL; - } - - switch (parse_address ()) { - case DONE: - free (dp); - dp = cp = NULL; - return NULL; - case OK: - switch (last_lex) { - case LX_COMA: - case LX_END: - break; - - default: /* catch trailing comments */ - bp = cp; - my_lex (adr); - cp = bp; - break; - } - break; - - default: - break; - } - - if (! eai) { - /* - * Reject the address if key fields contain 8bit characters - */ - - if (contains8bit(mbox, NULL) || contains8bit(host, NULL) || - contains8bit(path, NULL) || contains8bit(grp, NULL)) { - strcpy(err, "Address contains 8-bit characters"); - } + parse = parse_address(); + if (parse == DONE) { + free(dp); + dp = cp = NULL; + return NULL; + } + if (parse == OK && last_lex != LX_COMA && last_lex != LX_END) { + /* catch trailing comments */ + bp = cp; + my_lex(adr); + cp = bp; } + /* Reject the address if key fields contain 8bit characters. */ + if (!eai && + (contains8bit(mbox, NULL) || contains8bit(host, NULL) || + contains8bit(routepath, NULL) || contains8bit(grp, NULL))) + strcpy(err, "Address contains 8-bit characters"); + if (err[0]) - for (;;) { - switch (last_lex) { - case LX_COMA: - case LX_END: - break; + while (last_lex != LX_COMA && last_lex != LX_END) + my_lex(adr); - default: - my_lex (adr); - continue; - } - break; - } while (isspace ((unsigned char) *ap)) ap++; if (cp) @@ -269,7 +207,7 @@ getadrx (const char *addrs, int eai) adrxp->pers = pers; adrxp->mbox = mbox; adrxp->host = host; - adrxp->path = path; + adrxp->path = routepath; adrxp->grp = grp; adrxp->ingrp = ingrp; adrxp->note = note; @@ -297,11 +235,10 @@ again: ; strcpy (err, "extraneous semi-colon"); return NOTOK; } + /* FALLTHRU */ case LX_COMA: - if (note) { - free (note); - note = NULL; - } + mh_xfree(note); + note = NULL; goto again; case LX_END: @@ -402,6 +339,7 @@ again: ; strcpy (err, "extraneous semi-colon"); return NOTOK; } + return OK; case LX_COMA: case LX_END: return OK; @@ -433,16 +371,12 @@ again: ; static int phrase (char *buffer) { - for (;;) - switch (my_lex (buffer)) { - case LX_ATOM: - case LX_QSTR: - pers = add (buffer, add (" ", pers)); - continue; + int lex; - default: - return OK; - } + while ((lex = my_lex(buffer)) == LX_ATOM || lex == LX_QSTR) + pers = add(buffer, add(" ", pers)); + + return OK; } @@ -543,13 +477,13 @@ domain (char *buffer) static int route (char *buffer) { - path = strdup ("@"); + routepath = mh_xstrdup ("@"); for (;;) { switch (my_lex (buffer)) { case LX_ATOM: case LX_DLIT: - path = add (buffer, path); + routepath = add (buffer, routepath); break; default: @@ -558,14 +492,14 @@ route (char *buffer) } switch (my_lex (buffer)) { case LX_COMA: - path = add (buffer, path); + routepath = add (buffer, routepath); for (;;) { switch (my_lex (buffer)) { case LX_COMA: continue; case LX_AT: - path = add (buffer, path); + routepath = add (buffer, routepath); break; default: @@ -578,11 +512,11 @@ route (char *buffer) case LX_AT: /* XXX */ case LX_DOT: - path = add (buffer, path); + routepath = add (buffer, routepath); continue; case LX_COLN: - path = add (buffer, path); + routepath = add (buffer, routepath); return OK; default: @@ -624,7 +558,7 @@ my_lex (char *buffer) case 0: cp = NULL; return (last_lex = LX_ERR); - case QUOTE: + case '\\': ADDCHR(c); if ((c = *cp++) == 0) { cp = NULL; @@ -634,6 +568,7 @@ my_lex (char *buffer) continue; case '(': i++; + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -655,12 +590,13 @@ my_lex (char *buffer) case 0: cp = NULL; return (last_lex = LX_ERR); - case QUOTE: + case '\\': ADDCHR(c); if ((c = *cp++) == 0) { cp = NULL; return (last_lex = LX_ERR); } + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -678,12 +614,13 @@ my_lex (char *buffer) case 0: cp = NULL; return (last_lex = LX_ERR); - case QUOTE: + case '\\': ADDCHR(c); if ((c = *cp++) == 0) { cp = NULL; return (last_lex = LX_ERR); } + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -748,59 +685,3 @@ legal_person (const char *p) return (char *) p; } - - -int -mfgets (FILE *in, char **bp) -{ - int i; - char *cp, *dp, *ep; - static int len = 0; - static char *pp = NULL; - - if (pp == NULL) - pp = mh_xmalloc ((size_t) (len = BUFSIZ)); - - for (ep = (cp = pp) + len - 2;;) { - switch (i = getc (in)) { - case EOF: - eol: ; - if (cp != pp) { - *cp = 0; - *bp = pp; - return OK; - } - eoh: ; - *bp = NULL; - free (pp); - pp = NULL; - return DONE; - - case 0: - continue; - - case '\n': - if (cp == pp) /* end of headers, gobble it */ - goto eoh; - switch (i = getc (in)) { - default: /* end of line */ - case '\n': /* end of headers, save for next call */ - ungetc (i, in); - goto eol; - - case ' ': /* continue headers */ - case '\t': - *cp++ = '\n'; - break; - } /* fall into default case */ - - default: - *cp++ = i; - break; - } - if (cp >= ep) { - dp = mh_xrealloc (pp, (size_t) (len += BUFSIZ)); - cp += dp - pp, ep = (pp = cp) + len - 2; - } - } -}