Mercurial > dovecot > original-hg > dovecot-1.2

changeset 6607:59f5c5cbf7b7 HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include CRLFs in searched text between headers.
author Timo Sirainen <tss@iki.fi>
date Tue, 23 Oct 2007 16:49:37 +0300
parents 1fc0aae1c159
children c0d18ea33806
files src/lib-mail/message-search.c
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-mail/message-search.c	Tue Oct 23 16:44:18 2007 +0300
+++ b/src/lib-mail/message-search.c	Tue Oct 23 16:49:37 2007 +0300
@@ -106,12 +106,16 @@
 static bool search_header(struct message_search_context *ctx,
 			  const struct message_header_line *hdr)
 {
+	static const unsigned char crlf[2] = { '\r', '\n' };
+
 	return str_find_more(ctx->str_find_ctx,
 			     (const unsigned char *)hdr->name, hdr->name_len) ||
 		str_find_more(ctx->str_find_ctx,
 			      hdr->middle, hdr->middle_len) ||
 		str_find_more(ctx->str_find_ctx, hdr->full_value,
-			      hdr->full_value_len);
+			      hdr->full_value_len) ||
+		(!hdr->no_newline &&
+		 str_find_more(ctx->str_find_ctx, crlf, 2));
 }
 
 int message_search_more(struct message_search_context *ctx,