From 623a9d69008bc6881a4f70a7e9127220cdb9bdff Mon Sep 17 00:00:00 2001 From: NotZed Date: Fri, 21 Apr 2000 00:56:27 +0000 Subject: Trim leading/trailing spaces off the raw headers. 2000-04-20 NotZed * providers/mbox/camel-mbox-summary.c (message_struct_new): Trim leading/trailing spaces off the raw headers. svn path=/trunk/; revision=2536 --- camel/providers/mbox/camel-mbox-summary.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'camel/providers') diff --git a/camel/providers/mbox/camel-mbox-summary.c b/camel/providers/mbox/camel-mbox-summary.c index 11f1c5779a..c2aad8317a 100644 --- a/camel/providers/mbox/camel-mbox-summary.c +++ b/camel/providers/mbox/camel-mbox-summary.c @@ -341,6 +341,22 @@ body_part_new(CamelMimeParser *mp, CamelMboxMessageContentInfo *parent, int star return bs; } +static char *strdup_trim(const char *s) +{ + char *end; + + if (s == NULL) + return NULL; + + while (isspace(*s)) + s++; + end = s+strlen(s)-1; + while (end>s && isspace(*end)) + end--; + end = g_strndup(s, end-s+1); + return end; +} + static CamelMboxMessageInfo * message_struct_new(CamelMimeParser *mp, CamelMboxMessageContentInfo *parent, int start, int body, off_t xev_offset) { @@ -349,9 +365,9 @@ message_struct_new(CamelMimeParser *mp, CamelMboxMessageContentInfo *parent, int ms = g_malloc0(sizeof(*ms)); /* FIXME: what about cc, sender vs from? */ - ms->info.subject = g_strdup(camel_mime_parser_header(mp, "subject", NULL)); - ms->info.from = g_strdup(camel_mime_parser_header(mp, "from", NULL)); - ms->info.to = g_strdup(camel_mime_parser_header(mp, "to", NULL)); + ms->info.subject = strdup_trim(camel_mime_parser_header(mp, "subject", NULL)); + ms->info.from = strdup_trim(camel_mime_parser_header(mp, "from", NULL)); + ms->info.to = strdup_trim(camel_mime_parser_header(mp, "to", NULL)); ms->info.date_sent = header_decode_date(camel_mime_parser_header(mp, "date", NULL), NULL); ms->info.date_received = 0; -- cgit v1.2.3