dovecot/core-2.2: src/lib-imap-storage/imap-msgpart.c annotate

annotate src/lib-imap-storage/imap-msgpart.c @ 14853:5ceeb25ed337

imap: FETCH BODY[n] shouldn't include MIME headers

author	Timo Sirainen <tss@iki.fi>
date	Sat, 11 Aug 2012 04:09:41 +0300
parents	2ab4aa784474
children	f3ef88e19cd5

rev	line source
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	1 /* Copyright (c) 2012 Dovecot authors, see the included COPYING file */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	2
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	3 #include "lib.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	4 #include "array.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	5 #include "istream.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	6 #include "istream-crlf.h"
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	7 #include "istream-nonuls.h"
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	8 #include "istream-header-filter.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	9 #include "message-parser.h"
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	10 #include "mail-storage-private.h"
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	11 #include "mail-namespace.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	12 #include "imap-parser.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	13 #include "imap-msgpart.h"
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	14
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	15 enum fetch_type {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	16 FETCH_FULL,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	17 FETCH_MIME,
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	18 FETCH_MIME_BODY,
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	19 FETCH_HEADER,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	20 FETCH_HEADER_FIELDS,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	21 FETCH_HEADER_FIELDS_NOT,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	22 FETCH_BODY
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	23 };
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	24
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	25 struct imap_msgpart {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	26 pool_t pool;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	27
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	28 /* "" for root, otherwise e.g. "1.2.3". the .MIME, .HEADER, etc.
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	29 suffix not included */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	30 const char *section_number;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	31 enum fetch_type fetch_type;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	32 enum mail_fetch_field wanted_fields;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	33
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	34 /* HEADER.FIELDS[.NOT] (list of headers) */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	35 struct mailbox_header_lookup_ctx *header_ctx;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	36 const char const headers;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	37
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	38 /* which part of the message part to fetch (default: 0..(uoff_t)-1) */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	39 uoff_t partial_offset, partial_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	40 };
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	41
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	42 struct imap_msgpart_open_ctx {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	43 /* from matching message_part, set after opening: */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	44 uoff_t physical_pos;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	45 struct message_size mime_hdr_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	46 struct message_size mime_body_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	47 };
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	48
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	49 static struct imap_msgpart *imap_msgpart_type(enum fetch_type fetch_type)
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	50 {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	51 struct imap_msgpart *msgpart;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	52 pool_t pool;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	53
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	54 pool = pool_alloconly_create("imap msgpart", sizeof(*msgpart)+32);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	55 msgpart = p_new(pool, struct imap_msgpart, 1);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	56 msgpart->pool = pool;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	57 msgpart->partial_size = (uoff_t)-1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	58 msgpart->fetch_type = fetch_type;
14708 2ab4aa784474 imap: Fixed crashes on some FETCH commands Timo Sirainen <tss@iki.fi> parents: 14686 diff changeset	59 msgpart->section_number = "";
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	60 if (fetch_type == FETCH_HEADER \|\| fetch_type == FETCH_FULL)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	61 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_HEADER;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	62 if (fetch_type == FETCH_BODY \|\| fetch_type == FETCH_FULL)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	63 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_BODY;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	64 return msgpart;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	65 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	66
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	67 struct imap_msgpart *imap_msgpart_full(void)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	68 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	69 return imap_msgpart_type(FETCH_FULL);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	70 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	71
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	72 struct imap_msgpart *imap_msgpart_header(void)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	73 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	74 return imap_msgpart_type(FETCH_HEADER);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	75 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	76
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	77 struct imap_msgpart *imap_msgpart_body(void)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	78 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	79 return imap_msgpart_type(FETCH_BODY);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	80 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	81
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	82 static struct message_part *
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	83 imap_msgpart_find(struct message_part parts, const char section)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	84 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	85 struct message_part *part = parts;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	86 const char *path;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	87 unsigned int num;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	88
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	89 path = section;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	90 while (path >= '0' && path <= '9' && part != NULL) {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	91 /* get part number, we have already verified its validity */
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	92 num = 0;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	93 while (path != '\0' && path != '.') {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	94 i_assert(path >= '0' && path <= '9');
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	95
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	96 num = num10 + (path - '0');
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	97 path++;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	98 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	99
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	100 if (*path == '.')
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	101 path++;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	102
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	103 if ((part->flags & MESSAGE_PART_FLAG_MULTIPART) != 0) {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	104 /* find the part */
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	105 part = part->children;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	106 for (; num > 1 && part != NULL; num--)
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	107 part = part->next;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	108 } else {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	109 /* only 1 allowed with non-multipart messages */
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	110 if (num != 1)
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	111 part = NULL;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	112 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	113
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	114 if (part != NULL &&
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	115 (part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) != 0 &&
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	116 (path >= '0' && path <= '9')) {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	117 /* if we continue inside the message/rfc822, skip this
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	118 body part */
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	119 part = part->children;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	120 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	121 }
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	122 i_assert(part == NULL \|\| *path == '\0');
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	123 return part;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	124 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	125
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	126 static int
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	127 imap_msgpart_get_header_fields(pool_t pool, const char *header_list,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	128 ARRAY_TYPE(const_string) *fields)
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	129 {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	130 struct istream *input;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	131 struct imap_parser *parser;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	132 const struct imap_arg args, hdr_list;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	133 unsigned int list_count;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	134 unsigned int i;
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	135 int result = 0;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	136
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	137 input = i_stream_create_from_data(header_list, strlen(header_list));
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	138 parser = imap_parser_create(input, NULL, (size_t)-1);
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	139
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	140 if (imap_parser_finish_line(parser, 0, 0, &args) > 0 &&
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	141 imap_arg_get_list_full(args, &hdr_list, &list_count) &&
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	142 args[1].type == IMAP_ARG_EOL &&
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	143 list_count > 0) {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	144 const char *value;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	145
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	146 p_array_init(fields, pool, list_count);
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	147 for (i = 0; i < list_count; i++) {
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	148 if (!imap_arg_get_astring(&hdr_list[i], &value)) {
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	149 result = -1;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	150 break;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	151 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	152
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	153 value = p_strdup(pool, t_str_ucase(value));
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	154 array_append(fields, &value, 1);
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	155 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	156 } else {
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	157 result = -1;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	158 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	159
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	160 /* istream-header-filter requires headers to be sorted */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	161 array_sort(fields, i_strcasecmp_p);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	162
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	163 imap_parser_unref(&parser);
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	164 i_stream_unref(&input);
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	165 return result;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	166 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	167
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	168 static int
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	169 imap_msgpart_parse_header_fields(struct mailbox *box,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	170 struct imap_msgpart *msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	171 const char *header_list)
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	172 {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	173 ARRAY_TYPE(const_string) fields;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	174
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	175 /* HEADER.FIELDS (list), HEADER.FIELDS.NOT (list) */
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	176 if (imap_msgpart_get_header_fields(msgpart->pool, header_list,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	177 &fields) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	178 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	179
14686 9ff19c1d5f69 Added array_append_zero() to write a zero-filled record to an array. Timo Sirainen <tss@iki.fi> parents: 14629 diff changeset	180 array_append_zero(&fields);
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	181 msgpart->headers = array_idx(&fields, 0);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	182 msgpart->header_ctx = mailbox_header_lookup_init(box, msgpart->headers);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	183 return 0;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	184 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	185
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	186 int imap_msgpart_parse(struct mailbox box, const char section,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	187 struct imap_msgpart **msgpart_r)
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	188 {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	189 struct imap_msgpart *msgpart;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	190 pool_t pool;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	191 unsigned int i;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	192 bool next_digit;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	193 int ret;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	194
14708 2ab4aa784474 imap: Fixed crashes on some FETCH commands Timo Sirainen <tss@iki.fi> parents: 14686 diff changeset	195 pool = pool_alloconly_create("imap msgpart", 1024);
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	196 msgpart = *msgpart_r = p_new(pool, struct imap_msgpart, 1);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	197 msgpart->pool = pool;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	198 msgpart->partial_size = (uoff_t)-1;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	199
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	200 /* get the section number */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	201 next_digit = TRUE;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	202 for (i = 0; section[i] != '\0'; i++) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	203 if (section[i] >= '0' && section[i] <= '9') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	204 next_digit = FALSE;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	205 } else if (!next_digit && section[i] == '.') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	206 next_digit = TRUE;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	207 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	208 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	209 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	210 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	211 if (i == 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	212 /* [], [HEADER], etc. */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	213 msgpart->section_number = "";
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	214 } else if (section[i] == '\0') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	215 /* [1.2.3] */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	216 if (i > 0 && section[i-1] == '.') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	217 pool_unref(&pool);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	218 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	219 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	220 msgpart->section_number = p_strdup(pool, section);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	221 section = "";
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	222 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	223 /* [1.2.3.MIME], [1.2.3.HEADER], etc */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	224 if (section[i-1] != '.') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	225 pool_unref(&pool);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	226 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	227 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	228 msgpart->section_number = p_strndup(pool, section, i-1);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	229 section += i;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	230 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	231
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	232 if (*section == '\0') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	233 /* full message/MIME part */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	234 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_BODY;
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	235 if (*msgpart->section_number == '\0') {
5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	236 msgpart->fetch_type = FETCH_FULL;
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	237 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_HEADER;
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	238 } else {
5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	239 msgpart->fetch_type = FETCH_MIME_BODY;
5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	240 }
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	241 return 0;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	242 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	243 section = t_str_ucase(section);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	244
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	245 if (strcmp(section, "MIME") == 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	246 msgpart->fetch_type = FETCH_MIME;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	247 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_BODY;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	248 } else if (strcmp(section, "TEXT") == 0) {
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	249 /* body (for root or for message/rfc822) */
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	250 msgpart->fetch_type = FETCH_BODY;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	251 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_BODY;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	252 } else if (strncmp(section, "HEADER", 6) == 0) {
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	253 /* header (for root or for message/rfc822) */
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	254 if (section[6] == '\0') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	255 msgpart->fetch_type = FETCH_HEADER;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	256 ret = 0;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	257 } else if (strncmp(section, "HEADER.FIELDS ", 14) == 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	258 msgpart->fetch_type = FETCH_HEADER_FIELDS;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	259 ret = imap_msgpart_parse_header_fields(box, msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	260 section+14);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	261 } else if (strncmp(section, "HEADER.FIELDS.NOT ", 18) == 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	262 msgpart->fetch_type = FETCH_HEADER_FIELDS_NOT;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	263 ret = imap_msgpart_parse_header_fields(box, msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	264 section+18);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	265 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	266 ret = -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	267 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	268 if (ret < 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	269 imap_msgpart_free(&msgpart);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	270 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	271 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	272 if (msgpart->fetch_type == FETCH_HEADER_FIELDS) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	273 /* we may be able to get this from cache, don't give a
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	274 wanted_fields hint */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	275 } else if (*msgpart->section_number == '\0')
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	276 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_HEADER;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	277 else
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	278 msgpart->wanted_fields \|= MAIL_FETCH_STREAM_BODY;
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	279 } else {
5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	280 i_unreached();
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	281 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	282 return 0;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	283 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	284
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	285 void imap_msgpart_free(struct imap_msgpart **_msgpart)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	286 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	287 struct imap_msgpart msgpart = _msgpart;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	288
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	289 *_msgpart = NULL;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	290
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	291 if (msgpart->header_ctx != NULL)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	292 mailbox_header_lookup_unref(&msgpart->header_ctx);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	293 pool_unref(&msgpart->pool);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	294 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	295
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	296 void imap_msgpart_set_partial(struct imap_msgpart *msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	297 uoff_t offset, uoff_t size)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	298 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	299 msgpart->partial_offset = offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	300 msgpart->partial_size = size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	301 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	302
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	303 uoff_t imap_msgpart_get_partial_offset(struct imap_msgpart *msgpart)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	304 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	305 return msgpart->partial_offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	306 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	307
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	308 enum mail_fetch_field imap_msgpart_get_fetch_data(struct imap_msgpart *msgpart)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	309 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	310 return msgpart->wanted_fields;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	311 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	312
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	313 static int
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	314 imap_msgpart_get_partial_header(struct mail mail, struct istream mail_input,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	315 const struct imap_msgpart *msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	316 struct message_size *hdr_size_r,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	317 struct imap_msgpart_open_result *result_r)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	318 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	319 const char const hdr_fields = msgpart->headers;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	320 unsigned int hdr_count = str_array_length(hdr_fields);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	321 struct istream *input;
14629 c93ca5e46a8a Marked functions parameters that are allowed to be NULL. Some APIs were also changed. Timo Sirainen <tss@iki.fi> parents: 14622 diff changeset	322 bool has_nuls;
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	323
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	324 if (msgpart->fetch_type == FETCH_HEADER_FIELDS) {
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	325 input = i_stream_create_header_filter(mail_input,
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	326 HEADER_FILTER_INCLUDE \|
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	327 HEADER_FILTER_HIDE_BODY,
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	328 hdr_fields, hdr_count,
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	329 null_header_filter_callback, NULL);
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	330 } else {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	331 i_assert(msgpart->fetch_type == FETCH_HEADER_FIELDS_NOT);
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	332 input = i_stream_create_header_filter(mail_input,
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	333 HEADER_FILTER_EXCLUDE \|
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	334 HEADER_FILTER_HIDE_BODY,
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	335 hdr_fields, hdr_count,
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	336 null_header_filter_callback, NULL);
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	337 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	338
14629 c93ca5e46a8a Marked functions parameters that are allowed to be NULL. Some APIs were also changed. Timo Sirainen <tss@iki.fi> parents: 14622 diff changeset	339 if (message_get_header_size(input, hdr_size_r, &has_nuls) < 0) {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	340 errno = input->stream_errno;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	341 mail_storage_set_critical(mail->box->storage,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	342 "read(%s) failed: %m", i_stream_get_name(mail_input));
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	343 i_stream_unref(&input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	344 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	345 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	346 i_stream_seek(input, 0);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	347 result_r->input = input;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	348 result_r->size = hdr_size_r->virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	349 return 0;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	350 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	351
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	352 static void
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	353 skip_using_parts(struct mail mail, struct istream input,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	354 uoff_t *virtual_skip)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	355 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	356 enum mail_lookup_abort old_lookup_abort;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	357 struct message_part parts, part;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	358 uoff_t vpos;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	359 int ret;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	360
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	361 old_lookup_abort = mail->lookup_abort;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	362 mail->lookup_abort = MAIL_LOOKUP_ABORT_NOT_IN_CACHE;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	363 ret = mail_get_parts(mail, &parts);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	364 mail->lookup_abort = old_lookup_abort;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	365 if (ret < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	366 return;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	367
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	368 for (part = parts, vpos = 0; part != NULL; ) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	369 if (vpos + part->header_size.virtual_size > *virtual_skip)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	370 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	371 /* skip header */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	372 vpos += part->header_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	373 *virtual_skip -= part->header_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	374 i_stream_seek(input, part->physical_pos +
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	375 part->header_size.physical_size);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	376
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	377 if (vpos + part->body_size.virtual_size <= *virtual_skip) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	378 /* skip body */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	379 vpos += part->body_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	380 *virtual_skip -= part->body_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	381 i_stream_seek(input, part->physical_pos +
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	382 part->header_size.physical_size +
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	383 part->body_size.physical_size);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	384 part = part->next;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	385 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	386 /* maybe we have a child and can skip using it? */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	387 part = part->children;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	388 }
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	389 }
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	390 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	391
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	392 static struct istream *
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	393 imap_msgpart_crlf_seek(struct mail mail, struct istream input,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	394 const struct imap_msgpart *msgpart)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	395 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	396 struct mail_msgpart_partial_cache *cache = &mail->box->partial_cache;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	397 struct istream nul_input, crlf_input;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	398 const unsigned char *data;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	399 size_t size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	400 uoff_t physical_start = input->v_offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	401 uoff_t virtual_skip = msgpart->partial_offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	402
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	403 i_assert(msgpart->headers == NULL); /* HEADER.FIELDS returns CRLFs */
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	404
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	405 if (virtual_skip == 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	406 /* no need to seek */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	407 } else if (cache->uid == mail->uid &&
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	408 cache->physical_start == physical_start &&
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	409 cache->virtual_pos < virtual_skip) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	410 /* use cache */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	411 i_stream_seek(input, cache->physical_pos);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	412 virtual_skip -= cache->virtual_pos;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	413 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	414 /* can't use cache, but maybe we can skip faster using the
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	415 message parts. */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	416 skip_using_parts(mail, input, &virtual_skip);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	417 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	418 if (!mail->has_no_nuls) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	419 nul_input = i_stream_create_nonuls(input, 0x80);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	420 i_stream_unref(&input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	421 input = nul_input;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	422 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	423 crlf_input = i_stream_create_crlf(input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	424 i_stream_unref(&input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	425 input = crlf_input;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	426 i_stream_skip(input, virtual_skip);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	427
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	428 if ((msgpart->partial_offset != 0 \|\|
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	429 msgpart->partial_size != (uoff_t)-1) &&
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	430 i_stream_read_data(input, &data, &size, 0) > 0) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	431 /* update cache */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	432 cache->uid = mail->uid;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	433 cache->physical_start = physical_start;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	434 cache->physical_pos = input->v_offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	435 cache->virtual_pos = msgpart->partial_offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	436 if (data[0] == '\n') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	437 /* the physical_pos points to virtual CRLF, but
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	438 virtual_pos already skipped CR. that can't work,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	439 so seek back the virtual CR */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	440 cache->virtual_pos--;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	441 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	442 }
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	443 return input;
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	444 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	445
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	446 static void
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	447 imap_msgpart_get_partial(struct mail mail, const struct imap_msgpart msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	448 const struct message_size *part_size,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	449 struct imap_msgpart_open_result *result)
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	450 {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	451 struct istream *input2;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	452 uoff_t bytes_left;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	453
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	454 /* input is already seeked to the beginning of the wanted data */
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	455
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	456 if (msgpart->partial_offset >= part_size->virtual_size) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	457 /* can't seek past the MIME part */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	458 i_stream_unref(&result->input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	459 result->input = i_stream_create_from_data("", 0);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	460 result->size = 0;
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	461 return;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	462 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	463
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	464 if (part_size->virtual_size == part_size->physical_size) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	465 /* input has CRLF linefeeds, we can quickly seek to
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	466 wanted position */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	467 i_stream_skip(result->input, msgpart->partial_offset);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	468 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	469 /* input has LF linefeeds. it can be slow to seek to wanted
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	470 position, so try to do caching whenever possible */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	471 result->input = imap_msgpart_crlf_seek(mail, result->input,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	472 msgpart);
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	473 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	474
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	475 bytes_left = part_size->virtual_size - msgpart->partial_offset;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	476 if (msgpart->partial_size <= bytes_left) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	477 /* limit output to specified number of bytes */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	478 result->size = msgpart->partial_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	479 } else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	480 /* send all bytes */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	481 result->size = bytes_left;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	482 }
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	483 input2 = i_stream_create_limit(result->input, result->size);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	484 i_stream_unref(&result->input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	485 result->input = input2;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	486 }
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	487
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	488 int imap_msgpart_open(struct mail mail, struct imap_msgpart msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	489 struct imap_msgpart_open_result *result_r)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	490 {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	491 struct message_part parts, part = NULL;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	492 struct message_size hdr_size, body_size, part_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	493 struct istream *input = NULL;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	494 uoff_t physical_pos = 0;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	495
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	496 memset(result_r, 0, sizeof(*result_r));
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	497 memset(&hdr_size, 0, sizeof(hdr_size));
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	498 memset(&body_size, 0, sizeof(body_size));
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	499 memset(&part_size, 0, sizeof(part_size));
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	500
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	501 if (*msgpart->section_number != '\0') {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	502 /* find the MIME part */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	503 if (mail_get_parts(mail, &parts) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	504 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	505 part = imap_msgpart_find(parts, msgpart->section_number);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	506 if (part != NULL && (msgpart->fetch_type == FETCH_HEADER \|\|
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	507 msgpart->fetch_type == FETCH_BODY)) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	508 /* fetching message/rfc822 part's header/body */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	509 if ((part->flags & MESSAGE_PART_FLAG_MESSAGE_RFC822) == 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	510 part = NULL;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	511 else {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	512 i_assert(part->children != NULL &&
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	513 part->children->next == NULL);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	514 part = part->children;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	515 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	516 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	517 if (part == NULL) {
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	518 /* MIME part not found. return an empty stream. */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	519 result_r->input = i_stream_create_from_data("", 0);
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	520 return 0;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	521 }
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	522 if (mail_get_stream(mail, NULL, NULL, &input) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	523 return -1;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	524
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	525 physical_pos = part->physical_pos;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	526 hdr_size = part->header_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	527 body_size = part->body_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	528 } else switch (msgpart->fetch_type) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	529 case FETCH_FULL:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	530 /* fetch the whole message */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	531 if (mail_get_stream(mail, NULL, NULL, &input) < 0 \|\|
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	532 mail_get_virtual_size(mail, &body_size.virtual_size) < 0 \|\|
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	533 mail_get_physical_size(mail, &body_size.physical_size) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	534 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	535 result_r->size_field = MAIL_FETCH_VIRTUAL_SIZE;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	536 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	537 case FETCH_MIME:
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	538 case FETCH_MIME_BODY:
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	539 i_unreached();
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	540 case FETCH_HEADER:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	541 case FETCH_HEADER_FIELDS_NOT:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	542 /* fetch the message's header */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	543 if (mail_get_hdr_stream(mail, &hdr_size, &input) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	544 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	545 result_r->size_field = MAIL_FETCH_MESSAGE_PARTS;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	546 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	547 case FETCH_HEADER_FIELDS:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	548 /* try to lookup the headers from cache */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	549 i_assert(msgpart->header_ctx != NULL);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	550 if (mail_get_header_stream(mail, msgpart->header_ctx,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	551 &input) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	552 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	553 result_r->size_field = 0;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	554 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	555 case FETCH_BODY:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	556 /* fetch the message's body */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	557 if (mail_get_stream(mail, &hdr_size, &body_size, &input) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	558 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	559 result_r->size_field = MAIL_FETCH_MESSAGE_PARTS;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	560 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	561 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	562 i_stream_seek(input, physical_pos);
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	563
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	564 if (msgpart->headers != NULL) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	565 /* return specific headers */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	566 if (imap_msgpart_get_partial_header(mail, input, msgpart,
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	567 &hdr_size, result_r) < 0)
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	568 return -1;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	569 imap_msgpart_get_partial(mail, msgpart, &hdr_size, result_r);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	570 return 0;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	571 }
07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	572
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	573 switch (msgpart->fetch_type) {
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	574 case FETCH_FULL:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	575 part_size.physical_size += body_size.physical_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	576 part_size.virtual_size += body_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	577 /* fall through */
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	578 case FETCH_MIME:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	579 case FETCH_HEADER:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	580 part_size.physical_size += hdr_size.physical_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	581 part_size.virtual_size += hdr_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	582 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	583 case FETCH_HEADER_FIELDS:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	584 case FETCH_HEADER_FIELDS_NOT:
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	585 i_unreached();
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	586 case FETCH_BODY:
14853 5ceeb25ed337 imap: FETCH BODY[n] shouldn't include MIME headers Timo Sirainen <tss@iki.fi> parents: 14708 diff changeset	587 case FETCH_MIME_BODY:
14622 6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	588 i_stream_skip(input, hdr_size.physical_size);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	589 part_size.physical_size += body_size.physical_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	590 part_size.virtual_size += body_size.virtual_size;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	591 break;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	592 }
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	593
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	594 result_r->input = input;
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	595 i_stream_ref(input);
6fb61872b30a lib-imap-storage: imap-msgpart rewrite and API change. Timo Sirainen <tss@iki.fi> parents: 14594 diff changeset	596 imap_msgpart_get_partial(mail, msgpart, &part_size, result_r);
14594 27c8a6c9088d Error handling API changes to previous IMAP URL related changes. Timo Sirainen <tss@iki.fi> parents: 14591 diff changeset	597 return 0;
14591 07e6ca397a72 Created lib-imap-storage for IMAP-specific functionality that uses lib-storage. Stephan Bosch <stephan@rename-it.nl> parents: diff changeset	598 }

Mercurial > dovecot > core-2.2

annotate src/lib-imap-storage/imap-msgpart.c @ 14853:5ceeb25ed337