dovecot/original-hg/dovecot-1.2: src/lib-mail/message-body-search.c annotate

annotate src/lib-mail/message-body-search.c @ 1322:97f8c00b8d4c HEAD

Better handling for multiline headers. Before we skipped headers larger than input buffer size (8k with read (default), 256k with mmap). The skipping was also a bit buggy. Now we parse the lines one at a time. There's also a way to read the header fully into memory before parsing it, if really needed.

author	Timo Sirainen <tss@iki.fi>
date	Wed, 26 Mar 2003 19:29:01 +0200
parents	8028c4dcf38f
children	baf63e166aeb

rev	line source
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	1 /* Copyright (C) 2002 Timo Sirainen */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	2
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	3 #include "lib.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	4 #include "base64.h"
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	5 #include "buffer.h"
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	6 #include "istream.h"
896 21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	7 #include "strescape.h"
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	8 #include "charset-utf8.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	9 #include "quoted-printable.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	10 #include "message-parser.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	11 #include "message-content-parser.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	12 #include "message-header-search.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	13 #include "message-body-search.h"
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	14
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	15 #define DECODE_BLOCK_SIZE 8192
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	16
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	17 struct body_search_context {
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	18 pool_t pool;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	19
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	20 const char *key;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	21 size_t key_len;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	22
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	23 const char *charset;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	24 unsigned int unknown_charset:1;
716 dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	25 unsigned int search_header:1;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	26 };
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	27
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	28 struct part_search_context {
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	29 struct body_search_context *body_ctx;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	30
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	31 struct charset_translation *translation;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	32
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	33 buffer_t *decode_buf;
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	34 buffer_t *match_buf;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	35
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	36 char *content_type;
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	37 char *content_charset;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	38
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	39 unsigned int content_qp:1;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	40 unsigned int content_base64:1;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	41 unsigned int content_unknown:1;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	42 unsigned int content_type_text:1; /* text/any or message/any */
716 dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	43 unsigned int ignore_header:1;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	44 };
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	45
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	46 static void parse_content_type(const unsigned char *value, size_t value_len,
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	47 void *context)
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	48 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	49 struct part_search_context *ctx = context;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	50
896 21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	51 if (ctx->content_type != NULL) {
21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	52 ctx->content_type = i_strndup(value, value_len);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	53 ctx->content_type_text =
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	54 strncasecmp(ctx->content_type, "text/", 5) == 0 \|\|
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	55 strncasecmp(ctx->content_type, "message/", 8) == 0;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	56 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	57 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	58
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	59 static void
0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	60 parse_content_type_param(const unsigned char *name, size_t name_len,
0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	61 const unsigned char *value, size_t value_len,
0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	62 int value_quoted, void *context)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	63 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	64 struct part_search_context *ctx = context;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	65
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	66 if (name_len == 7 && memcasecmp(name, "charset", 7) == 0 &&
896 21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	67 ctx->content_charset == NULL) {
21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	68 ctx->content_charset = i_strndup(value, value_len);
21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	69 if (value_quoted) str_unescape(ctx->content_charset);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	70 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	71 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	72
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	73 static void parse_content_encoding(const unsigned char *value, size_t value_len,
896 21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	74 void *context)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	75 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	76 struct part_search_context *ctx = context;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	77
896 21ffcce83c70 Rewrote rfc822-tokenize.c to work one token at a time so it won't uselessly Timo Sirainen <tss@iki.fi> parents: 805 diff changeset	78 switch (value_len) {
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	79 case 4:
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	80 if (memcasecmp(value, "7bit", 4) != 0 &&
0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	81 memcasecmp(value, "8bit", 4) != 0)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	82 ctx->content_unknown = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	83 break;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	84 case 6:
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	85 if (memcasecmp(value, "base64", 6) == 0)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	86 ctx->content_base64 = TRUE;
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	87 else if (memcasecmp(value, "binary", 6) != 0)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	88 ctx->content_unknown = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	89 break;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	90 case 16:
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	91 if (memcasecmp(value, "quoted-printable", 16) == 0)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	92 ctx->content_qp = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	93 else
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	94 ctx->content_unknown = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	95 break;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	96 default:
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	97 ctx->content_unknown = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	98 break;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	99 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	100 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	101
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	102 static int message_search_header(struct part_search_context *ctx,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	103 struct istream *input)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	104 {
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	105 struct header_search_context *hdr_search_ctx;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	106 struct message_header_parser_ctx *hdr_ctx;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	107 struct message_header_line *hdr;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	108 int found = FALSE;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	109
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	110 hdr_search_ctx = message_header_search_init(data_stack_pool,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	111 ctx->body_ctx->key,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	112 ctx->body_ctx->charset,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	113 NULL);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	114
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	115 /* we default to text content-type */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	116 ctx->content_type_text = TRUE;
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	117
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	118 hdr_ctx = message_parse_header_init(input, NULL);
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	119 while ((hdr = message_parse_header_next(hdr_ctx)) != NULL) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	120 if (!ctx->ignore_header) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	121 if (message_header_search(hdr->value, hdr->value_len,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	122 hdr_search_ctx)) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	123 found = TRUE;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	124 break;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	125 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	126 }
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	127
1322 97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	128 if (hdr->name_len == 12 &&
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	129 strcasecmp(hdr->name, "Content-Type") == 0) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	130 if (hdr->continues) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	131 hdr->use_full_value = TRUE;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	132 continue;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	133 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	134 message_content_parse_header(hdr->full_value,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	135 hdr->full_value_len,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	136 parse_content_type,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	137 parse_content_type_param,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	138 ctx);
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	139 } else if (hdr->name_len == 25 &&
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	140 strcasecmp(hdr->name,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	141 "Content-Transfer-Encoding") == 0) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	142 if (hdr->continues) {
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	143 hdr->use_full_value = TRUE;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	144 continue;
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	145 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	146 message_content_parse_header(hdr->full_value,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	147 hdr->full_value_len,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	148 parse_content_encoding,
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	149 NULL, ctx);
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	150 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	151 }
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	152 message_parse_header_deinit(hdr_ctx);
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	153
97f8c00b8d4c Better handling for multiline headers. Before we skipped headers larger than Timo Sirainen <tss@iki.fi> parents: 988 diff changeset	154 return found;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	155 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	156
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	157 static int message_search_decoded_block(struct part_search_context *ctx,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	158 buffer_t *block)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	159 {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	160 const unsigned char p, end, *key;
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	161 size_t key_len, block_size, *matches, match_count, value;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	162 ssize_t i;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	163
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	164 key = (const unsigned char *) ctx->body_ctx->key;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	165 key_len = ctx->body_ctx->key_len;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	166
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	167 matches = buffer_get_modifyable_data(ctx->match_buf, &match_count);
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	168 match_count /= sizeof(size_t);
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	169
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	170 p = buffer_get_data(block, &block_size);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	171 end = p + block_size;
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	172 for (; p != end; p++) {
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	173 for (i = match_count-1; i >= 0; i--) {
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	174 if (key[matches[i]] == *p) {
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	175 if (++matches[i] == key_len) {
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	176 /* full match */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	177 p++;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	178 return TRUE;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	179 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	180 } else {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	181 /* non-match */
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	182 buffer_delete(ctx->match_buf,
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	183 i * sizeof(size_t),
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	184 sizeof(size_t));
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	185 match_count--;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	186 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	187 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	188
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	189 if (*p == key[0]) {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	190 if (key_len == 1) {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	191 /* only one character in search key */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	192 p++;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	193 return TRUE;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	194 }
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	195
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	196 value = 1;
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	197 buffer_append(ctx->match_buf, &value, sizeof(value));
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	198 match_count++;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	199 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	200 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	201
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	202 return FALSE;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	203 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	204
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	205 /* returns 1 = found, 0 = not found, -1 = error in input data */
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	206 static int message_search_body_block(struct part_search_context *ctx,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	207 buffer_t *block)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	208 {
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	209 const unsigned char *inbuf;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	210 buffer_t *outbuf;
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	211 enum charset_result result;
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	212 size_t block_pos, inbuf_size, inbuf_left, ret;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	213
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	214 outbuf = buffer_create_static(data_stack_pool, DECODE_BLOCK_SIZE);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	215 for (block_pos = 0; block_pos < buffer_get_used_size(block); ) {
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	216 if (buffer_get_used_size(ctx->decode_buf) == 0) {
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	217 /* we can use the buffer directly without copying */
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	218 inbuf = buffer_get_data(block, &inbuf_size);
d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	219 inbuf += block_pos; inbuf_size -= block_pos;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	220 block_pos += buffer_get_used_size(block);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	221 } else {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	222 /* some characters already in buffer, ie. last
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	223 conversion contained partial data */
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	224 block_pos += buffer_append_buf(ctx->decode_buf,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	225 block, block_pos,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	226 (size_t)-1);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	227
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	228 inbuf = buffer_get_data(ctx->decode_buf, &inbuf_size);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	229 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	230
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	231 buffer_set_used_size(outbuf, 0);
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	232 inbuf_left = inbuf_size;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	233 result = charset_to_ucase_utf8(ctx->translation,
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	234 inbuf, &inbuf_size, outbuf);
d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	235 inbuf_left -= inbuf_size;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	236
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	237 switch (result) {
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	238 case CHARSET_RET_OUTPUT_FULL:
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	239 /* we should have copied the incomplete sequence.. */
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	240 i_assert(inbuf_left <= block_pos);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	241 /* fall through */
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	242 case CHARSET_RET_OK:
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	243 buffer_set_used_size(ctx->decode_buf, 0);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	244 block_pos -= inbuf_left;
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	245 break;
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	246 case CHARSET_RET_INCOMPLETE_INPUT:
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	247 /* save the partial sequence to buffer */
785 d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	248 ret = buffer_write(ctx->decode_buf, 0,
d96cbba73a8b Don't use Buffers with read-only data, just makes it more difficult without Timo Sirainen <tss@iki.fi> parents: 765 diff changeset	249 inbuf + inbuf_size, inbuf_left);
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	250 i_assert(ret == inbuf_left);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	251
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	252 buffer_set_used_size(ctx->decode_buf, ret);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	253 break;
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	254
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	255 case CHARSET_RET_INVALID_INPUT:
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	256 return -1;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	257 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	258
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	259 if (message_search_decoded_block(ctx, outbuf))
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	260 return 1;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	261 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	262
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	263 return 0;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	264 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	265
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	266 static int message_search_body(struct part_search_context *ctx,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	267 struct istream *input,
988 8028c4dcf38f mail-storage.h interface changes, affects pretty much everything. Timo Sirainen <tss@iki.fi> parents: 903 diff changeset	268 const struct message_part *part)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	269 {
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	270 const unsigned char *data;
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	271 buffer_t *decodebuf;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	272 size_t data_size, pos;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	273 uoff_t old_limit;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	274 ssize_t ret;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	275 int found;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	276
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	277 if (ctx->content_unknown) {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	278 /* unknown content-encoding-type, ignore */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	279 return FALSE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	280 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	281
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	282 if (!ctx->content_type_text) {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	283 /* non-text content, ignore - FIXME: should be configurable? */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	284 return FALSE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	285 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	286
716 dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	287 ctx->translation = ctx->content_charset == NULL ? NULL :
dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	288 charset_to_utf8_begin(ctx->content_charset, NULL);
dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	289 if (ctx->translation == NULL)
dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	290 ctx->translation = charset_to_utf8_begin("ascii", NULL);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	291
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	292 ctx->decode_buf = buffer_create_static(data_stack_pool, 256);
805 5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	293 ctx->match_buf = buffer_create_static_hard(data_stack_pool,
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	294 sizeof(size_t) *
5ac361acb316 Marked all non-trivial buffer modifications with @UNSAFE tag. Several Timo Sirainen <tss@iki.fi> parents: 785 diff changeset	295 ctx->body_ctx->key_len);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	296
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	297 i_stream_skip(input, part->physical_pos +
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	298 part->header_size.physical_size - input->v_offset);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	299
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	300 old_limit = input->v_limit;
f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	301 i_stream_set_read_limit(input, input->v_offset +
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	302 part->body_size.physical_size);
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	303
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	304 found = FALSE; pos = 0;
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	305 while (i_stream_read_data(input, &data, &data_size, pos) > 0) {
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	306 /* limit the size of t_malloc()s */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	307 if (data_size > DECODE_BLOCK_SIZE)
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	308 data_size = DECODE_BLOCK_SIZE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	309 pos = data_size;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	310
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	311 t_push();
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	312 if (ctx->content_qp) {
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	313 decodebuf = buffer_create_static_hard(data_stack_pool,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	314 data_size);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	315 quoted_printable_decode(data, data_size,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	316 &data_size, decodebuf);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	317 } else if (ctx->content_base64) {
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	318 size_t size = MAX_BASE64_DECODED_SIZE(data_size);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	319 decodebuf = buffer_create_static_hard(data_stack_pool,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	320 size);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	321
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	322 if (base64_decode(data, data_size,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	323 &data_size, decodebuf) < 0) {
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	324 /* corrupted base64 data, don't bother with
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	325 the rest of it */
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	326 t_pop();
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	327 break;
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	328 }
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	329 } else {
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	330 decodebuf = buffer_create_const_data(data_stack_pool,
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	331 data, data_size);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	332 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	333
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	334 ret = message_search_body_block(ctx, decodebuf);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	335 t_pop();
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	336
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	337 if (ret != 0) {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	338 found = ret > 0;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	339 break;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	340 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	341
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	342 i_stream_skip(input, data_size);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	343 pos -= data_size;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	344 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	345
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	346 i_stream_set_read_limit(input, old_limit);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	347
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	348 if (ctx->translation != NULL)
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	349 charset_to_utf8_end(ctx->translation);
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	350 return found;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	351 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	352
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	353 static int message_body_search_init(struct body_search_context *ctx,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	354 const char key, const char charset,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	355 int *unknown_charset, int search_header)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	356 {
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	357 size_t key_len;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	358
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	359 memset(ctx, 0, sizeof(struct body_search_context));
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	360
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	361 /* get the key uppercased */
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	362 key = charset_to_ucase_utf8_string(charset, unknown_charset,
898 0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	363 (const unsigned char *) key,
0d5be52d7131 Use unsigned char* when accessing non-NUL terminating strings. Compiler Timo Sirainen <tss@iki.fi> parents: 896 diff changeset	364 strlen(key), &key_len);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	365 if (key == NULL)
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	366 return FALSE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	367
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	368 ctx->key = key;
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	369 ctx->key_len = key_len;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	370 ctx->charset = charset;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	371 ctx->unknown_charset = charset == NULL;
716 dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	372 ctx->search_header = search_header;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	373
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	374 i_assert(ctx->key_len <= SSIZE_T_MAX/sizeof(size_t));
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	375
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	376 return TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	377 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	378
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	379 static int message_body_search_ctx(struct body_search_context *ctx,
fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	380 struct istream *input,
988 8028c4dcf38f mail-storage.h interface changes, affects pretty much everything. Timo Sirainen <tss@iki.fi> parents: 903 diff changeset	381 const struct message_part *part)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	382 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	383 struct part_search_context part_ctx;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	384 int found;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	385
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	386 found = FALSE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	387 while (part != NULL && !found) {
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	388 i_assert(input->v_offset <= part->physical_pos);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	389
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	390 i_stream_skip(input, part->physical_pos - input->v_offset);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	391
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	392 memset(&part_ctx, 0, sizeof(part_ctx));
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	393 part_ctx.body_ctx = ctx;
716 dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	394 part_ctx.ignore_header =
dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	395 part->parent == NULL && !ctx->search_header;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	396
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	397 t_push();
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	398
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	399 if (message_search_header(&part_ctx, input)) {
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	400 found = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	401 } else if (part->children != NULL) {
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	402 /* multipart/xxx or message/rfc822 */
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	403 if (message_body_search_ctx(ctx, input, part->children))
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	404 found = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	405 } else {
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	406 if (message_search_body(&part_ctx, input, part))
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	407 found = TRUE;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	408 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	409
765 553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	410 i_free(part_ctx.content_type);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	411 i_free(part_ctx.content_charset);
553f050c8313 Added buffer API. Point is to hide all buffer writing behind this API which Timo Sirainen <tss@iki.fi> parents: 764 diff changeset	412
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	413 t_pop();
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	414
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	415 part = part->next;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	416 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	417
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	418 return found;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	419 }
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	420
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	421 int message_body_search(const char key, const char charset,
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	422 int unknown_charset, struct istream input,
988 8028c4dcf38f mail-storage.h interface changes, affects pretty much everything. Timo Sirainen <tss@iki.fi> parents: 903 diff changeset	423 const struct message_part *part, int search_header)
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	424 {
903 fd8888f6f037 Naming style changes, finally got tired of most of the typedefs. Also the Timo Sirainen <tss@iki.fi> parents: 898 diff changeset	425 struct body_search_context ctx;
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	426
716 dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	427 if (!message_body_search_init(&ctx, key, charset, unknown_charset,
dd574ac271c1 Body searching wasn't working with unknown charsets, and SEARCH BODY Timo Sirainen <tss@iki.fi> parents: 608 diff changeset	428 search_header))
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	429 return -1;
debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	430
764 f57c52738f90 Renamed IBuffer and OBuffer to IStream and OStream which describes their Timo Sirainen <tss@iki.fi> parents: 716 diff changeset	431 return message_body_search_ctx(&ctx, input, part);
608 debb8468514e SEARCH CHARSET now works properly with message bodies, and in general body Timo Sirainen <tss@iki.fi> parents: diff changeset	432 }

Mercurial > dovecot > original-hg > dovecot-1.2

annotate src/lib-mail/message-body-search.c @ 1322:97f8c00b8d4c HEAD