Added is_addr_char_no_pipes macro, which specifically does not consider

2001-07-12  Jon Trowbridge  <trow@ximian.com>

	* e-html-utils.c: Added is_addr_char_no_pipes macro, which
	specifically does not consider '|' ("pipe") to be a legal address
	character.
	(email_address_extract): Use is_addr_char_no_pipes when looking
	for e-mail addresses to turn into HTML links. (Bug #3940)

svn path=/trunk/; revision=11029

1 files changed, 3 insertions, 2 deletions

diff --git a/e-util/e-html-utils.c b/e-util/e-html-utils.c
index ca918f231a..ac4e35c0f6 100644
--- a/e-util/e-html-utils.c
+++ b/e-util/e-html-utils.c
@@ -54,6 +54,7 @@ static int special_chars[] = {
 };
 
 #define is_addr_char(c) (isprint (c) && !(special_chars[c] & 1))
+#define is_addr_char_no_pipes(c) (is_addr_char(c) && (c) != '|')
 #define is_trailing_garbage(c) (!isprint(c) || (special_chars[c] & 2))
 
 static char *
@@ -88,13 +89,13 @@ email_address_extract (const unsigned char **cur, char **out, const unsigned cha
 	char *addr;
 
 	/* *cur points to the '@'. Look backward for a valid local-part */
-	for (start = *cur; start - 1 >= linestart && is_addr_char (*(start - 1)); start--)
+	for (start = *cur; start - 1 >= linestart && is_addr_char_no_pipes (*(start - 1)); start--)
 		;
 	if (start == *cur)
 		return NULL;
 
 	/* Now look forward for a valid domain part */
-	for (end = *cur + 1, dot = NULL; is_addr_char (*end); end++) {
+	for (end = *cur + 1, dot = NULL; is_addr_char_no_pipes (*end); end++) {
 		if (*end == '.' && !dot)
 			dot = end;
 	}