X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/767e669eb7c50e5dd7e1ec9aae5c06c2b66b0819..94187a80bd60baab4b9c4b949ad820d730578123:/sbr/mf.c diff --git a/sbr/mf.c b/sbr/mf.c index 870a0a52..6c4afec5 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,37 +22,13 @@ static int route (char *); static int my_lex (char *); -int -isfrom(const char *string) -{ - return (HasPrefix(string, "From ") - || HasPrefix(string, ">From ")); -} - - -int -lequal (const char *a, const char *b) -{ - char c1, c2; - - for (; *a; a++, b++) { - if (*b == 0) - return FALSE; - c1 = toupper((unsigned char)*a); - c2 = toupper((unsigned char)*b); - if (c1 != c2) - return FALSE; - } - - return (*b == 0); -} - - static int isat (const char *p) { - return HasPrefix(p, " AT ") || HasPrefix(p, " At ") || - HasPrefix(p, " aT ") || HasPrefix(p, " at "); + return *p == ' ' && + (p[1] == 'a' || p[1] == 'A') && + (p[2] == 't' || p[2] == 'T') && + p[3] == ' '; } @@ -115,8 +90,6 @@ isat (const char *p) * */ -#define QUOTE '\\' - #define LX_END 0 #define LX_ERR 1 #define LX_ATOM 2 @@ -145,7 +118,7 @@ static struct specials special[] = { { '@', LX_AT }, { '(', LX_ERR }, { ')', LX_ERR }, - { QUOTE, LX_ERR }, + { '\\', LX_ERR }, { '"', LX_ERR }, { '[', LX_ERR }, { ']', LX_ERR }, @@ -162,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]; @@ -175,77 +148,51 @@ static struct adrx adrxs2; struct adrx * getadrx (const char *addrs, int eai) { + int parse; char *bp; struct adrx *adrxp = &adrxs2; - mh_xfree(pers); - mh_xfree(mbox); - mh_xfree(host); - mh_xfree(path); - mh_xfree(grp); - mh_xfree(note); - pers = mbox = host = path = grp = note = NULL; + free(pers); + free(mbox); + free(host); + free(routepath); + free(grp); + free(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) @@ -260,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; @@ -288,8 +235,9 @@ again: ; strcpy (err, "extraneous semi-colon"); return NOTOK; } + /* FALLTHRU */ case LX_COMA: - mh_xfree(note); + free(note); note = NULL; goto again; @@ -391,6 +339,7 @@ again: ; strcpy (err, "extraneous semi-colon"); return NOTOK; } + return OK; case LX_COMA: case LX_END: return OK; @@ -422,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; } @@ -532,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: @@ -547,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: @@ -567,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: @@ -595,7 +540,7 @@ my_lex (char *buffer) bp = buffer; *bp = 0; if (!cp) - return (last_lex = LX_END); + return last_lex = LX_END; gotat = isat (cp); c = *cp++; @@ -603,7 +548,7 @@ my_lex (char *buffer) c = *cp++; if (c == 0) { cp = NULL; - return (last_lex = LX_END); + return last_lex = LX_END; } if (c == '(') { @@ -612,17 +557,18 @@ my_lex (char *buffer) switch (c = *cp++) { case 0: cp = NULL; - return (last_lex = LX_ERR); - case QUOTE: + return last_lex = LX_ERR; + case '\\': ADDCHR(c); if ((c = *cp++) == 0) { cp = NULL; - return (last_lex = LX_ERR); + return last_lex = LX_ERR; } ADDCHR(c); continue; case '(': i++; + /* FALLTHRU */ default: ADDCHR(c); continue; @@ -643,20 +589,21 @@ my_lex (char *buffer) switch (c = *cp++) { case 0: cp = NULL; - return (last_lex = LX_ERR); - case QUOTE: + return last_lex = LX_ERR; + case '\\': ADDCHR(c); if ((c = *cp++) == 0) { cp = NULL; - return (last_lex = LX_ERR); + return last_lex = LX_ERR; } + /* FALLTHRU */ default: ADDCHR(c); continue; case '"': ADDCHR(c); *bp = 0; - return (last_lex = LX_QSTR); + return last_lex = LX_QSTR; } } @@ -666,20 +613,21 @@ my_lex (char *buffer) switch (c = *cp++) { case 0: cp = NULL; - return (last_lex = LX_ERR); - case QUOTE: + return last_lex = LX_ERR; + case '\\': ADDCHR(c); if ((c = *cp++) == 0) { cp = NULL; - return (last_lex = LX_ERR); + return last_lex = LX_ERR; } + /* FALLTHRU */ default: ADDCHR(c); continue; case ']': ADDCHR(c); *bp = 0; - return (last_lex = LX_DLIT); + return last_lex = LX_DLIT; } } @@ -687,10 +635,10 @@ my_lex (char *buffer) *bp = 0; for (i = 0; special[i].lx_chr != 0; i++) if (c == special[i].lx_chr) - return (last_lex = special[i].lx_val); + return last_lex = special[i].lx_val; if (iscntrl ((unsigned char) c)) - return (last_lex = LX_ERR); + return last_lex = LX_ERR; for (;;) { if ((c = *cp++) == 0) @@ -715,7 +663,7 @@ got_atom: ; my_lex_buffull: /* Out of buffer space. *bp is the last byte in the buffer */ *bp = 0; - return (last_lex = LX_ERR); + return last_lex = LX_ERR; } @@ -737,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; - } - } -}