Mercurial > dovecot > core-2.2
annotate src/lib-mail/message-decoder.c @ 18137:3009a1a6f6d5
global: freshen copyright
Robomatically:
git ls-files | xargs perl -p -i -e 's/(\d+)-201[0-4]/$1-2015/g;s/ (201[0-4]) Dovecot/ $1-2015 Dovecot/'
Happy 2015 everyone!
Signed-off-by: Phil Carmody <phil@dovecot.fi>
author | Phil Carmody <phil@dovecot.fi> |
---|---|
date | Mon, 05 Jan 2015 22:20:10 +0200 |
parents | bbf760c25a9e |
children | e3640ccaa76d |
rev | line source |
---|---|
18137 | 1 /* Copyright (c) 2006-2015 Dovecot authors, see the included COPYING file */ |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
2 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
3 #include "lib.h" |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
4 #include "buffer.h" |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
5 #include "base64.h" |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
6 #include "str.h" |
6131
5f56b2eb32b3
Use uni_utf8_to_decomposed_titlecase() to have proper case-insensitive UTF-8
Timo Sirainen <tss@iki.fi>
parents:
6122
diff
changeset
|
7 #include "unichar.h" |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
8 #include "charset-utf8.h" |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
9 #include "quoted-printable.h" |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
10 #include "rfc822-parser.h" |
7950
3412c43d6707
Merge RFC 2231 header continuations in BODY/BODYSTRUCTURE replies. Also use
Timo Sirainen <tss@iki.fi>
parents:
7226
diff
changeset
|
11 #include "rfc2231-parser.h" |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
12 #include "message-parser.h" |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
13 #include "message-header-decode.h" |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
14 #include "message-decoder.h" |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
15 |
4885 | 16 /* base64 takes max 4 bytes per character, q-p takes max 3. */ |
17 #define MAX_ENCODING_BUF_SIZE 3 | |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
18 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
19 /* UTF-8 takes max 5 bytes per character. Not sure about others, but I'd think |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
20 10 is more than enough for everyone.. */ |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
21 #define MAX_TRANSLATION_BUF_SIZE 10 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
22 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
23 struct message_decoder_context { |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
24 enum message_decoder_flags flags; |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
25 normalizer_func_t *normalizer; |
5410
73032525bca0
Don't try to access output variable's contents. They are undefined at least
Timo Sirainen <tss@iki.fi>
parents:
4903
diff
changeset
|
26 struct message_part *prev_part; |
73032525bca0
Don't try to access output variable's contents. They are undefined at least
Timo Sirainen <tss@iki.fi>
parents:
4903
diff
changeset
|
27 |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
28 struct message_header_line hdr; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
29 buffer_t *buf, *buf2; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
30 |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
31 char *charset_trans_charset; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
32 struct charset_translation *charset_trans; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
33 char translation_buf[MAX_TRANSLATION_BUF_SIZE]; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
34 unsigned int translation_size; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
35 |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
36 buffer_t *encoding_buf; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
37 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
38 char *content_charset; |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
39 enum message_cte message_cte; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
40 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
41 unsigned int charset_utf8:1; |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
42 unsigned int binary_input:1; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
43 }; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
44 |
13121
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
45 static void |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
46 message_decode_body_init_charset(struct message_decoder_context *ctx, |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
47 struct message_part *part); |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
48 |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
49 struct message_decoder_context * |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
50 message_decoder_init(normalizer_func_t *normalizer, |
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
51 enum message_decoder_flags flags) |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
52 { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
53 struct message_decoder_context *ctx; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
54 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
55 ctx = i_new(struct message_decoder_context, 1); |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
56 ctx->flags = flags; |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
57 ctx->normalizer = normalizer; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
58 ctx->buf = buffer_create_dynamic(default_pool, 8192); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
59 ctx->buf2 = buffer_create_dynamic(default_pool, 8192); |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
60 ctx->encoding_buf = buffer_create_dynamic(default_pool, 128); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
61 return ctx; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
62 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
63 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
64 void message_decoder_deinit(struct message_decoder_context **_ctx) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
65 { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
66 struct message_decoder_context *ctx = *_ctx; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
67 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
68 *_ctx = NULL; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
69 |
4888 | 70 if (ctx->charset_trans != NULL) |
71 charset_to_utf8_end(&ctx->charset_trans); | |
72 | |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
73 buffer_free(&ctx->encoding_buf); |
6414
a6a49d5efc59
Changed buffer_free() and buffer_free_without_data() APIs to take ** pointer
Timo Sirainen <tss@iki.fi>
parents:
6133
diff
changeset
|
74 buffer_free(&ctx->buf); |
a6a49d5efc59
Changed buffer_free() and buffer_free_without_data() APIs to take ** pointer
Timo Sirainen <tss@iki.fi>
parents:
6133
diff
changeset
|
75 buffer_free(&ctx->buf2); |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
76 i_free(ctx->charset_trans_charset); |
4888 | 77 i_free(ctx->content_charset); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
78 i_free(ctx); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
79 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
80 |
13121
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
81 void message_decoder_set_return_binary(struct message_decoder_context *ctx, |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
82 bool set) |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
83 { |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
84 if (set) |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
85 ctx->flags |= MESSAGE_DECODER_FLAG_RETURN_BINARY; |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
86 else |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
87 ctx->flags &= ~MESSAGE_DECODER_FLAG_RETURN_BINARY; |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
88 message_decode_body_init_charset(ctx, ctx->prev_part); |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
89 } |
15082db3225a
lib-mail: Added message_decoder_set_return_binary()
Timo Sirainen <tss@iki.fi>
parents:
13015
diff
changeset
|
90 |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
91 enum message_cte message_decoder_parse_cte(struct message_header_line *hdr) |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
92 { |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
93 struct rfc822_parser_context parser; |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
94 enum message_cte message_cte; |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
95 string_t *value; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
96 |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
97 value = t_str_new(64); |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
98 rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
99 |
14689
096e4c4d62bb
Try to avoid (void) casts by adding more ATTR_NOWARN_UNUSED_RESULT.
Timo Sirainen <tss@iki.fi>
parents:
14688
diff
changeset
|
100 rfc822_skip_lwsp(&parser); |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
101 (void)rfc822_parse_mime_token(&parser, value); |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
102 |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
103 message_cte = MESSAGE_CTE_UNKNOWN; |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
104 switch (str_len(value)) { |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
105 case 4: |
6423
13b0a3ba5f7b
Added i_ prefix to strcmp_p(), strcasecmp_p() and memcasecmp().
Timo Sirainen <tss@iki.fi>
parents:
6414
diff
changeset
|
106 if (i_memcasecmp(str_data(value), "7bit", 4) == 0 || |
13b0a3ba5f7b
Added i_ prefix to strcmp_p(), strcasecmp_p() and memcasecmp().
Timo Sirainen <tss@iki.fi>
parents:
6414
diff
changeset
|
107 i_memcasecmp(str_data(value), "8bit", 4) == 0) |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
108 message_cte = MESSAGE_CTE_78BIT; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
109 break; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
110 case 6: |
6423
13b0a3ba5f7b
Added i_ prefix to strcmp_p(), strcasecmp_p() and memcasecmp().
Timo Sirainen <tss@iki.fi>
parents:
6414
diff
changeset
|
111 if (i_memcasecmp(str_data(value), "base64", 6) == 0) |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
112 message_cte = MESSAGE_CTE_BASE64; |
6423
13b0a3ba5f7b
Added i_ prefix to strcmp_p(), strcasecmp_p() and memcasecmp().
Timo Sirainen <tss@iki.fi>
parents:
6414
diff
changeset
|
113 else if (i_memcasecmp(str_data(value), "binary", 6) == 0) |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
114 message_cte = MESSAGE_CTE_BINARY; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
115 break; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
116 case 16: |
6423
13b0a3ba5f7b
Added i_ prefix to strcmp_p(), strcasecmp_p() and memcasecmp().
Timo Sirainen <tss@iki.fi>
parents:
6414
diff
changeset
|
117 if (i_memcasecmp(str_data(value), "quoted-printable", 16) == 0) |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
118 message_cte = MESSAGE_CTE_QP; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
119 break; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
120 } |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
121 return message_cte; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
122 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
123 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
124 static void |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
125 parse_content_type(struct message_decoder_context *ctx, |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
126 struct message_header_line *hdr) |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
127 { |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
128 struct rfc822_parser_context parser; |
7950
3412c43d6707
Merge RFC 2231 header continuations in BODY/BODYSTRUCTURE replies. Also use
Timo Sirainen <tss@iki.fi>
parents:
7226
diff
changeset
|
129 const char *const *results; |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
130 string_t *str; |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
131 |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
132 if (ctx->content_charset != NULL) |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
133 return; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
134 |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
135 rfc822_parser_init(&parser, hdr->full_value, hdr->full_value_len, NULL); |
14689
096e4c4d62bb
Try to avoid (void) casts by adding more ATTR_NOWARN_UNUSED_RESULT.
Timo Sirainen <tss@iki.fi>
parents:
14688
diff
changeset
|
136 rfc822_skip_lwsp(&parser); |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
137 str = t_str_new(64); |
6940
414c9d631a81
Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents:
6916
diff
changeset
|
138 if (rfc822_parse_content_type(&parser, str) <= 0) |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
139 return; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
140 |
14688
128c598d2870
Avoid using (void)s by adding ATTR_NOWARN_UNUSED_RESULT attributes and other ways.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
141 rfc2231_parse(&parser, &results); |
7950
3412c43d6707
Merge RFC 2231 header continuations in BODY/BODYSTRUCTURE replies. Also use
Timo Sirainen <tss@iki.fi>
parents:
7226
diff
changeset
|
142 for (; *results != NULL; results += 2) { |
3412c43d6707
Merge RFC 2231 header continuations in BODY/BODYSTRUCTURE replies. Also use
Timo Sirainen <tss@iki.fi>
parents:
7226
diff
changeset
|
143 if (strcasecmp(results[0], "charset") == 0) { |
3412c43d6707
Merge RFC 2231 header continuations in BODY/BODYSTRUCTURE replies. Also use
Timo Sirainen <tss@iki.fi>
parents:
7226
diff
changeset
|
144 ctx->content_charset = i_strdup(results[1]); |
3412c43d6707
Merge RFC 2231 header continuations in BODY/BODYSTRUCTURE replies. Also use
Timo Sirainen <tss@iki.fi>
parents:
7226
diff
changeset
|
145 ctx->charset_utf8 = charset_is_utf8(results[1]); |
6117
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
146 break; |
9214044ce1f1
Removed message-content-parser. Instead added rfc822_parse_content_type()
Timo Sirainen <tss@iki.fi>
parents:
6114
diff
changeset
|
147 } |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
148 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
149 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
150 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
151 static bool message_decode_header(struct message_decoder_context *ctx, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
152 struct message_header_line *hdr, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
153 struct message_block *output) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
154 { |
5511
518a77f3bf49
Renamed message_decoder_init() to message_decoder_init_ucase() and changed
Timo Sirainen <tss@iki.fi>
parents:
5510
diff
changeset
|
155 size_t value_len; |
518a77f3bf49
Renamed message_decoder_init() to message_decoder_init_ucase() and changed
Timo Sirainen <tss@iki.fi>
parents:
5510
diff
changeset
|
156 |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
157 if (hdr->continues) { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
158 hdr->use_full_value = TRUE; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
159 return FALSE; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
160 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
161 |
7226
e6693a0ec8e1
Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents:
7086
diff
changeset
|
162 T_BEGIN { |
6940
414c9d631a81
Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents:
6916
diff
changeset
|
163 if (hdr->name_len == 12 && |
414c9d631a81
Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents:
6916
diff
changeset
|
164 strcasecmp(hdr->name, "Content-Type") == 0) |
414c9d631a81
Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents:
6916
diff
changeset
|
165 parse_content_type(ctx, hdr); |
414c9d631a81
Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents:
6916
diff
changeset
|
166 if (hdr->name_len == 25 && |
414c9d631a81
Replaced t_push/t_pop calls with T_FRAME*() macros.
Timo Sirainen <tss@iki.fi>
parents:
6916
diff
changeset
|
167 strcasecmp(hdr->name, "Content-Transfer-Encoding") == 0) |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
168 ctx->message_cte = message_decoder_parse_cte(hdr); |
7226
e6693a0ec8e1
Renamed T_FRAME_BEGIN/END to T_BEGIN/END. Removed T_FRAME() macro and
Timo Sirainen <tss@iki.fi>
parents:
7086
diff
changeset
|
169 } T_END; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
170 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
171 buffer_set_used_size(ctx->buf, 0); |
6118
841b052e269e
Added message_header_decode_utf8(). Use it in message decoder instead of
Timo Sirainen <tss@iki.fi>
parents:
6117
diff
changeset
|
172 message_header_decode_utf8(hdr->full_value, hdr->full_value_len, |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
173 ctx->buf, ctx->normalizer); |
5511
518a77f3bf49
Renamed message_decoder_init() to message_decoder_init_ucase() and changed
Timo Sirainen <tss@iki.fi>
parents:
5510
diff
changeset
|
174 value_len = ctx->buf->used; |
518a77f3bf49
Renamed message_decoder_init() to message_decoder_init_ucase() and changed
Timo Sirainen <tss@iki.fi>
parents:
5510
diff
changeset
|
175 |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
176 if (ctx->normalizer != NULL) { |
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
177 (void)ctx->normalizer(hdr->name, hdr->name_len, ctx->buf); |
6113
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
178 buffer_append_c(ctx->buf, '\0'); |
13015
c392158f374d
message [header] decoder: Output only valid UTF-8 data.
Timo Sirainen <tss@iki.fi>
parents:
12782
diff
changeset
|
179 } else { |
c392158f374d
message [header] decoder: Output only valid UTF-8 data.
Timo Sirainen <tss@iki.fi>
parents:
12782
diff
changeset
|
180 if (!uni_utf8_get_valid_data((const unsigned char *)hdr->name, |
c392158f374d
message [header] decoder: Output only valid UTF-8 data.
Timo Sirainen <tss@iki.fi>
parents:
12782
diff
changeset
|
181 hdr->name_len, ctx->buf)) |
c392158f374d
message [header] decoder: Output only valid UTF-8 data.
Timo Sirainen <tss@iki.fi>
parents:
12782
diff
changeset
|
182 buffer_append_c(ctx->buf, '\0'); |
6113
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
183 } |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
184 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
185 ctx->hdr = *hdr; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
186 ctx->hdr.full_value = ctx->buf->data; |
5511
518a77f3bf49
Renamed message_decoder_init() to message_decoder_init_ucase() and changed
Timo Sirainen <tss@iki.fi>
parents:
5510
diff
changeset
|
187 ctx->hdr.full_value_len = value_len; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
188 ctx->hdr.value_len = 0; |
13015
c392158f374d
message [header] decoder: Output only valid UTF-8 data.
Timo Sirainen <tss@iki.fi>
parents:
12782
diff
changeset
|
189 if (ctx->buf->used != value_len) { |
6113
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
190 ctx->hdr.name = CONST_PTR_OFFSET(ctx->buf->data, |
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
191 ctx->hdr.full_value_len); |
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
192 ctx->hdr.name_len = ctx->buf->used - 1 - value_len; |
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
193 } |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
194 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
195 output->hdr = &ctx->hdr; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
196 return TRUE; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
197 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
198 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
199 static void translation_buf_decode(struct message_decoder_context *ctx, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
200 const unsigned char **data, size_t *size) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
201 { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
202 unsigned char trans_buf[MAX_TRANSLATION_BUF_SIZE+1]; |
6832 | 203 unsigned int data_wanted, skip; |
16074
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
204 size_t trans_size, orig_size; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
205 |
6832 | 206 /* @UNSAFE: move the previously untranslated bytes to trans_buf |
207 and see if we have now enough data to get the next character | |
208 translated */ | |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
209 memcpy(trans_buf, ctx->translation_buf, ctx->translation_size); |
6832 | 210 data_wanted = sizeof(trans_buf) - ctx->translation_size; |
211 if (data_wanted > *size) | |
212 data_wanted = *size; | |
213 memcpy(trans_buf + ctx->translation_size, *data, data_wanted); | |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
214 |
16074
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
215 orig_size = trans_size = ctx->translation_size + data_wanted; |
6832 | 216 (void)charset_to_utf8(ctx->charset_trans, trans_buf, |
217 &trans_size, ctx->buf2); | |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
218 |
16075
311371856dcf
message-decode: Minor fix to previous change.
Timo Sirainen <tss@iki.fi>
parents:
16074
diff
changeset
|
219 if (trans_size <= ctx->translation_size) { |
16074
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
220 /* need more data to finish the translation. */ |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
221 i_assert(orig_size < MAX_TRANSLATION_BUF_SIZE); |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
222 memcpy(ctx->translation_buf, trans_buf, orig_size); |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
223 ctx->translation_size = orig_size; |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
224 *data += *size; |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
225 *size = 0; |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
226 return; |
cf7b590d19f9
message-decoder: Fixed assert-crash when trying to decode partial character twice.
Timo Sirainen <tss@iki.fi>
parents:
14133
diff
changeset
|
227 } |
6832 | 228 skip = trans_size - ctx->translation_size; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
229 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
230 i_assert(*size >= skip); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
231 *data += skip; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
232 *size -= skip; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
233 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
234 ctx->translation_size = 0; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
235 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
236 |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
237 static void |
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
238 message_decode_body_init_charset(struct message_decoder_context *ctx, |
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
239 struct message_part *part) |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
240 { |
9360
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
241 ctx->binary_input = ctx->content_charset == NULL && |
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
242 (ctx->flags & MESSAGE_DECODER_FLAG_RETURN_BINARY) != 0 && |
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
243 (part->flags & (MESSAGE_PART_FLAG_TEXT | |
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
244 MESSAGE_PART_FLAG_MESSAGE_RFC822)) == 0; |
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
245 |
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
246 if (ctx->charset_utf8 || ctx->binary_input) |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
247 return; |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
248 |
9360
fd3c13b9837b
Message-decoder: Fixes to handling binary body parts.
Timo Sirainen <tss@iki.fi>
parents:
9322
diff
changeset
|
249 if (ctx->charset_trans != NULL && ctx->content_charset != NULL && |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
250 strcasecmp(ctx->content_charset, ctx->charset_trans_charset) == 0) { |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
251 /* already have the correct translation selected */ |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
252 return; |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
253 } |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
254 |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
255 if (ctx->charset_trans != NULL) |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
256 charset_to_utf8_end(&ctx->charset_trans); |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
257 i_free_and_null(ctx->charset_trans_charset); |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
258 |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
259 ctx->charset_trans_charset = i_strdup(ctx->content_charset != NULL ? |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
260 ctx->content_charset : "UTF-8"); |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
261 if (charset_to_utf8_begin(ctx->charset_trans_charset, ctx->normalizer, |
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
262 &ctx->charset_trans) < 0) |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
263 ctx->charset_trans = NULL; |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
264 } |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
265 |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
266 static bool message_decode_body(struct message_decoder_context *ctx, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
267 struct message_block *input, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
268 struct message_block *output) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
269 { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
270 const unsigned char *data = NULL; |
11074
c32f55615055
Small code changes to make static analyzer happier.
Timo Sirainen <tss@iki.fi>
parents:
10582
diff
changeset
|
271 size_t pos = 0, size = 0; |
5510 | 272 int ret; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
273 |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
274 if (ctx->encoding_buf->used != 0) { |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
275 /* @UNSAFE */ |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
276 buffer_append(ctx->encoding_buf, input->data, input->size); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
277 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
278 |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
279 switch (ctx->message_cte) { |
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
280 case MESSAGE_CTE_UNKNOWN: |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
281 /* just skip this body */ |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
282 return FALSE; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
283 |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
284 case MESSAGE_CTE_78BIT: |
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
285 case MESSAGE_CTE_BINARY: |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
286 data = input->data; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
287 size = pos = input->size; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
288 break; |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
289 case MESSAGE_CTE_QP: |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
290 buffer_set_used_size(ctx->buf, 0); |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
291 if (ctx->encoding_buf->used != 0) { |
15453
0be51d94b0d9
lib-mail: Detect errors in quoted-printable input.
Timo Sirainen <tss@iki.fi>
parents:
15053
diff
changeset
|
292 (void)quoted_printable_decode(ctx->encoding_buf->data, |
0be51d94b0d9
lib-mail: Detect errors in quoted-printable input.
Timo Sirainen <tss@iki.fi>
parents:
15053
diff
changeset
|
293 ctx->encoding_buf->used, |
0be51d94b0d9
lib-mail: Detect errors in quoted-printable input.
Timo Sirainen <tss@iki.fi>
parents:
15053
diff
changeset
|
294 &pos, ctx->buf); |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
295 } else { |
15453
0be51d94b0d9
lib-mail: Detect errors in quoted-printable input.
Timo Sirainen <tss@iki.fi>
parents:
15053
diff
changeset
|
296 (void)quoted_printable_decode(input->data, input->size, |
0be51d94b0d9
lib-mail: Detect errors in quoted-printable input.
Timo Sirainen <tss@iki.fi>
parents:
15053
diff
changeset
|
297 &pos, ctx->buf); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
298 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
299 data = ctx->buf->data; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
300 size = ctx->buf->used; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
301 break; |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
302 case MESSAGE_CTE_BASE64: |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
303 buffer_set_used_size(ctx->buf, 0); |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
304 if (ctx->encoding_buf->used != 0) { |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
305 ret = base64_decode(ctx->encoding_buf->data, |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
306 ctx->encoding_buf->used, |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
307 &pos, ctx->buf); |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
308 } else { |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
309 ret = base64_decode(input->data, input->size, |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
310 &pos, ctx->buf); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
311 } |
5510 | 312 if (ret < 0) { |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
313 /* corrupted base64 data, don't bother with |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
314 the rest of it */ |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
315 return FALSE; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
316 } |
5510 | 317 if (ret == 0) { |
4885 | 318 /* end of base64 input */ |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
319 pos = input->size; |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
320 buffer_set_used_size(ctx->encoding_buf, 0); |
4885 | 321 } |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
322 data = ctx->buf->data; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
323 size = ctx->buf->used; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
324 break; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
325 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
326 |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
327 if (ctx->encoding_buf->used != 0) |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
328 buffer_delete(ctx->encoding_buf, 0, pos); |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
329 else if (pos != input->size) { |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
330 buffer_append(ctx->encoding_buf, |
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
331 input->data + pos, input->size - pos); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
332 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
333 |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
334 if (ctx->binary_input) { |
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
335 output->data = data; |
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
336 output->size = size; |
17792
bbf760c25a9e
lib-mail: Message decoder now runs normalizer also for unknown charsets.
Timo Sirainen <tss@iki.fi>
parents:
17130
diff
changeset
|
337 } else if (ctx->charset_utf8 || ctx->charset_trans == NULL) { |
bbf760c25a9e
lib-mail: Message decoder now runs normalizer also for unknown charsets.
Timo Sirainen <tss@iki.fi>
parents:
17130
diff
changeset
|
338 /* handle unknown charsets the same as UTF-8. it might find |
bbf760c25a9e
lib-mail: Message decoder now runs normalizer also for unknown charsets.
Timo Sirainen <tss@iki.fi>
parents:
17130
diff
changeset
|
339 usable ASCII text. */ |
6952
08e4d7efcd6a
uni_utf8_get_valid_data() API changed.
Timo Sirainen <tss@iki.fi>
parents:
6951
diff
changeset
|
340 buffer_set_used_size(ctx->buf2, 0); |
15053
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
341 if (ctx->normalizer != NULL) { |
c976a9c01613
Replaced "decomposed titlecase" conversions with more generic normalizer function.
Timo Sirainen <tss@iki.fi>
parents:
14857
diff
changeset
|
342 (void)ctx->normalizer(data, size, ctx->buf2); |
6113
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
343 output->data = ctx->buf2->data; |
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
344 output->size = ctx->buf2->used; |
6952
08e4d7efcd6a
uni_utf8_get_valid_data() API changed.
Timo Sirainen <tss@iki.fi>
parents:
6951
diff
changeset
|
345 } else if (uni_utf8_get_valid_data(data, size, ctx->buf2)) { |
08e4d7efcd6a
uni_utf8_get_valid_data() API changed.
Timo Sirainen <tss@iki.fi>
parents:
6951
diff
changeset
|
346 output->data = data; |
08e4d7efcd6a
uni_utf8_get_valid_data() API changed.
Timo Sirainen <tss@iki.fi>
parents:
6951
diff
changeset
|
347 output->size = size; |
6113
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
348 } else { |
6952
08e4d7efcd6a
uni_utf8_get_valid_data() API changed.
Timo Sirainen <tss@iki.fi>
parents:
6951
diff
changeset
|
349 output->data = ctx->buf2->data; |
08e4d7efcd6a
uni_utf8_get_valid_data() API changed.
Timo Sirainen <tss@iki.fi>
parents:
6951
diff
changeset
|
350 output->size = ctx->buf2->used; |
6113
adbfce5bf7d9
Changed message_decoder_init_ucase() to message_decoder_init(bool ucase)
Timo Sirainen <tss@iki.fi>
parents:
6112
diff
changeset
|
351 } |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
352 } else { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
353 buffer_set_used_size(ctx->buf2, 0); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
354 if (ctx->translation_size != 0) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
355 translation_buf_decode(ctx, &data, &size); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
356 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
357 pos = size; |
6122
d86581f4a0c6
charset_to_utf8() isn't used anymore, so renamed charset_to_utf8_full() to it.
Timo Sirainen <tss@iki.fi>
parents:
6118
diff
changeset
|
358 (void)charset_to_utf8(ctx->charset_trans, |
d86581f4a0c6
charset_to_utf8() isn't used anymore, so renamed charset_to_utf8_full() to it.
Timo Sirainen <tss@iki.fi>
parents:
6118
diff
changeset
|
359 data, &pos, ctx->buf2); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
360 if (pos != size) { |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
361 ctx->translation_size = size - pos; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
362 i_assert(ctx->translation_size <= |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
363 sizeof(ctx->translation_buf)); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
364 memcpy(ctx->translation_buf, data + pos, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
365 ctx->translation_size); |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
366 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
367 output->data = ctx->buf2->data; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
368 output->size = ctx->buf2->used; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
369 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
370 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
371 output->hdr = NULL; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
372 return TRUE; |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
373 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
374 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
375 bool message_decoder_decode_next_block(struct message_decoder_context *ctx, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
376 struct message_block *input, |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
377 struct message_block *output) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
378 { |
5410
73032525bca0
Don't try to access output variable's contents. They are undefined at least
Timo Sirainen <tss@iki.fi>
parents:
4903
diff
changeset
|
379 if (input->part != ctx->prev_part) { |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
380 /* MIME part changed. */ |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
381 message_decoder_decode_reset(ctx); |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
382 } |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
383 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
384 output->part = input->part; |
5410
73032525bca0
Don't try to access output variable's contents. They are undefined at least
Timo Sirainen <tss@iki.fi>
parents:
4903
diff
changeset
|
385 ctx->prev_part = input->part; |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
386 |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
387 if (input->hdr != NULL) |
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
388 return message_decode_header(ctx, input->hdr, output); |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
389 else if (input->size != 0) |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
390 return message_decode_body(ctx, input, output); |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
391 else { |
6942 | 392 output->hdr = NULL; |
393 output->size = 0; | |
9322
ce612bdafc84
message-decoder now supports optionally returning non-text bodyparts as-is.
Timo Sirainen <tss@iki.fi>
parents:
8590
diff
changeset
|
394 message_decode_body_init_charset(ctx, input->part); |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
395 return TRUE; |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
396 } |
4608
61e0fe257a83
Added message-decoder to decode message's contents into readable UTF-8.
Timo Sirainen <tss@iki.fi>
parents:
diff
changeset
|
397 } |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
398 |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
399 void message_decoder_decode_reset(struct message_decoder_context *ctx) |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
400 { |
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
401 i_free_and_null(ctx->content_charset); |
14857
624107158354
lib-mail: Added message_decoder_parse_cte()
Timo Sirainen <tss@iki.fi>
parents:
14689
diff
changeset
|
402 ctx->message_cte = MESSAGE_CTE_78BIT; |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
403 ctx->charset_utf8 = TRUE; |
9664
4c255c7b6245
message-decoder: Fixed assert-crashes caused by the previous quoted-printable change.
Timo Sirainen <tss@iki.fi>
parents:
9360
diff
changeset
|
404 buffer_set_used_size(ctx->encoding_buf, 0); |
6916
0b8a78914db7
Message decoding wasn't reset properly between messages when searching.
Timo Sirainen <tss@iki.fi>
parents:
6915
diff
changeset
|
405 } |