From: Neale Pickett Date: Mon, 10 Oct 2005 19:20:45 +0000 Subject: Re: [CFT] mlmmj-1.2.9-RC1 Message-Id: <200510101320.45754.neale@woozle.org> MIME-Version: 1 Content-Type: multipart/mixed; boundary="Boundary-00=_N8rSDEHmTQe16n8" List-Id: References: <20051009151204.GB17022@mmj.dk> In-Reply-To: <20051009151204.GB17022@mmj.dk> To: mlmmj@mlmmj.org --Boundary-00=_N8rSDEHmTQe16n8 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline On Sunday 09 October 2005 11:33 pm, Mads Martin Joergensen wrote: > * Patrick Bennett [Oct 10. 2005 00:56]: > > Also, I wonder about the issue of handling the "From:" header in an > > RFC-compliant way > > I'm sure the code Neale found is exactly what's needed, it's only a > matter of someone finding the time to integrate it, and send me a patch. You made it too easy on me, Mads! I only had to change one function! This isn't a patch, because I rewrote the entire file. Just drop it into your src directory and try it out. And please do, if you have the stomach for it. I'm not convinced this will work for all situations. Please consider this an "alpha" version. My mail lists aren't terribly active so I need help testing. Neale --Boundary-00=_N8rSDEHmTQe16n8 Content-Type: text/x-csrc; charset="iso-8859-1"; name="find_email_adr.c" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="find_email_adr.c" /* Some crap from BSD mail to parse email addresses. * * Neale Pickett stole these functions from FreeBSD * ports, and reformatted them to use mlmmj's coding style. The * original functions (skip_comment and skin) had the following * copyright notice: */ /* * Copyright (c) 1980, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ #include #include #include #include "find_email_adr.h" #include "memory.h" /* * Start of a "comment". * Ignore it. */ static char * skip_comment(char *cp) { int nesting = 1; for (; nesting > 0 && *cp; cp++) { switch (*cp) { case '\\': if (cp[1]) cp++; break; case '(': nesting++; break; case ')': nesting--; break; } } return (cp); } /* * Skin an arpa net address according to the RFC 822 interpretation * of "host-phrase." */ static char *skin(char *name) { char *nbuf, *bufend, *cp, *cp2; int c, gotlt, lastsp; if (name == NULL) return (NULL); if (strchr(name, '(') == NULL && strchr(name, '<') == NULL && strchr(name, ' ') == NULL) return (name); /* We assume that length(input) <= length(output) */ nbuf = mymalloc(strlen(name) + 1); gotlt = 0; lastsp = 0; bufend = nbuf; for (cp = name, cp2 = bufend; (c = *cp++) != '\0'; ) { switch (c) { case '(': cp = skip_comment(cp); lastsp = 0; break; case '"': /* * Start of a "quoted-string". * Copy it in its entirety. */ while ((c = *cp) != '\0') { cp++; if (c == '"') break; if (c != '\\') *cp2++ = c; else if ((c = *cp) != '\0') { *cp2++ = c; cp++; } } lastsp = 0; break; case ' ': if (cp[0] == 'a' && cp[1] == 't' && cp[2] == ' ') cp += 3, *cp2++ = '@'; else if (cp[0] == '@' && cp[1] == ' ') cp += 2, *cp2++ = '@'; else lastsp = 1; break; case '<': cp2 = bufend; gotlt++; lastsp = 0; break; case '>': if (gotlt) { gotlt = 0; while ((c = *cp) != '\0' && c != ',') { cp++; if (c == '(') cp = skip_comment(cp); else if (c == '"') while ((c = *cp) != '\0') { cp++; if (c == '"') break; if (c == '\\' && *cp != '\0') cp++; } } lastsp = 0; break; } /* FALLTHROUGH */ default: if (lastsp) { lastsp = 0; *cp2++ = ' '; } *cp2++ = c; if (c == ',' && *cp == ' ' && !gotlt) { *cp2++ = ' '; while (*++cp == ' ') ; lastsp = 0; bufend = cp2; } } } *cp2 = '\0'; nbuf = (char *)myrealloc(nbuf, strlen(nbuf) + 1); return (nbuf); } struct email_container *find_email_adr(const char *str, struct email_container *retstruct) { char *p; char *s; s = (char *)mymalloc(strlen(str) + 1); strcpy(s, str); p = s; while(p) { char *adr; char *cur; cur = p; p = strchr(p, ','); if (p) { /* If there's a comma, replace it with a NUL, so * cur will only have one address in it. */ *p = '\0'; p += 1; } printf("cur: %s\n", cur); while(cur && ((' ' == *cur) || ('\t' == *cur) || ('\r' == *cur) || ('\n' == *cur))) { cur += 1; } if ('\0' == *cur) { continue; } adr = skin(cur); if (adr) { printf("adr: %s\n", adr); retstruct->emailcount++; retstruct->emaillist = (char **)myrealloc(retstruct->emaillist, sizeof(char *) * retstruct->emailcount); retstruct->emaillist[retstruct->emailcount-1] = adr; } } myfree(s); return retstruct; } --Boundary-00=_N8rSDEHmTQe16n8--