summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Stedfast <fejj@ximian.com>2002-10-07 18:10:24 +0000
committerJeffrey Stedfast <fejj@src.gnome.org>2002-10-07 18:10:24 +0000
commit973a1c07e5050827da7b2aa387e74c1718edd82c (patch)
treef57c73088ac9dc109a9fe54d115212ab1a080efc
parente8c620afe202bf2ef9792f34eba645a26d44aa34 (diff)
downloadevolution-data-server-973a1c07e5050827da7b2aa387e74c1718edd82c.tar.gz
Fix all mailing list regex patterns to allow any number of spaces *or*
2002-10-06 Jeffrey Stedfast <fejj@ximian.com> * camel-mime-utils.c: Fix all mailing list regex patterns to allow any number of spaces *or* tabs as pre-padding for the header values.
-rw-r--r--camel/ChangeLog6
-rw-r--r--camel/camel-mime-utils.c22
2 files changed, 17 insertions, 11 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 6af81525f..68f63ef12 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-06 Jeffrey Stedfast <fejj@ximian.com>
+
+ * camel-mime-utils.c: Fix all mailing list regex patterns to allow
+ any number of spaces *or* tabs as pre-padding for the header
+ values.
+
2002-10-03 Jeffrey Stedfast <fejj@ximian.com>
* camel-mime-part.c (write_to_stream): Use the content-object's
diff --git a/camel/camel-mime-utils.c b/camel/camel-mime-utils.c
index 379721568..ef21531f0 100644
--- a/camel/camel-mime-utils.c
+++ b/camel/camel-mime-utils.c
@@ -3738,9 +3738,9 @@ static struct {
/* X-Mailing-List: gnome-hackers@gnome.org */
/* X-Mailing-List: gnome-hackers */
/* X-Mailing-List: <gnome-hackers> */
- { "X-Mailing-List", " <?([^@>]+)@?([^ \n\t\r>]*)" },
+ { "X-Mailing-List", "[ \t]*<?([^@>]+)@?([^ \n\t\r>]*)" },
/* X-Loop: gnome-hackers@gnome.org */
- { "X-Loop", " *([^@]+)@?([^ \n\t\r>]*)" },
+ { "X-Loop", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* List-Id: GNOME stuff <gnome-hackers.gnome.org> */
/* List-Id: <gnome-hackers.gnome.org> */
/* List-Id: <gnome-hackers> */
@@ -3748,31 +3748,31 @@ static struct {
{ "List-Id", "[^<]*<([^\\.>]+)\\.?([^ \n\t\r>]*)" },
/* List-Post: <mailto:gnome-hackers@gnome.org> */
/* List-Post: <mailto:gnome-hackers> */
- { "List-Post", " *<mailto:([^@>]+)@?([^ \n\t\r>]*)" },
+ { "List-Post", "[ \t]*<mailto:([^@>]+)@?([^ \n\t\r>]*)" },
/* Mailing-List: list gnome-hackers@gnome.org; contact gnome-hackers-owner@gnome.org */
- { "Mailing-List", " *list ([^@]+)@?([^ \n\t\r>;]*)" },
+ { "Mailing-List", "[ \t]*list ([^@]+)@?([^ \n\t\r>;]*)" },
/* Originator: gnome-hackers@gnome.org */
- { "Originator", " *([^@]+)@?([^ \n\t\r>]*)" },
+ { "Originator", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* X-List: gnome-hackers */
/* X-List: gnome-hackers@gnome.org */
- { "X-List", " *([^@]+)@?([^ \n\t\r>]*)" },
+ { "X-List", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
/* Sender: owner-gnome-hackers@gnome.org */
/* Sender: owner-gnome-hacekrs */
- { "Sender", " *owner-([^@]+)@?([^ @\n\t\r>]*)" },
+ { "Sender", "[ \t]*owner-([^@]+)@?([^ @\n\t\r>]*)" },
/* Sender: gnome-hackers-owner@gnome.org */
/* Sender: gnome-hackers-owner */
- { "Sender", " *([^@]+)-owner@?([^ @\n\t\r>]*)" },
+ { "Sender", "[ \t]*([^@]+)-owner@?([^ @\n\t\r>]*)" },
/* Delivered-To: mailing list gnome-hackers@gnome.org */
/* Delivered-To: mailing list gnome-hackers */
- { "Delivered-To", " *mailing list ([^@]+)@?([^ \n\t\r>]*)" },
+ { "Delivered-To", "[ \t]*mailing list ([^@]+)@?([^ \n\t\r>]*)" },
/* Sender: owner-gnome-hackers@gnome.org */
/* Sender: <owner-gnome-hackers@gnome.org> */
/* Sender: owner-gnome-hackers */
/* Sender: <owner-gnome-hackers> */
- { "Return-Path", " <?owner-([^@>]+)@?([^ \n\t\r>]*)" },
+ { "Return-Path", "[ \t]*<?owner-([^@>]+)@?([^ \n\t\r>]*)" },
/* X-BeenThere: gnome-hackers@gnome.org */
/* X-BeenThere: gnome-hackers */
- { "X-BeenThere", " *([^@]+)@?([^ \n\t\r>]*)" },
+ { "X-BeenThere", "[ \t]*([^@]+)@?([^ \n\t\r>]*)" },
};
char *