From: Timo Sirainen <tss@iki.fi>
Date: Thu, 13 Aug 2009 16:23:44 +0000 (-0400)
Subject: lib-storage: Actually use MAIL_READ_BLOCK_SIZE sized blocks when reading mails.
X-Git-Tag: 2.0.alpha1~274
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d42eb03b3a4e79a2da22a1be2de59b95660af2be;p=thirdparty%2Fdovecot%2Fcore.git

lib-storage: Actually use MAIL_READ_BLOCK_SIZE sized blocks when reading mails.

--HG--
branch : HEAD
---

diff --git a/src/lib-storage/index/cydir/cydir-mail.c b/src/lib-storage/index/cydir/cydir-mail.c
index 8f23fb581b..06d2071d2f 100644
--- a/src/lib-storage/index/cydir/cydir-mail.c
+++ b/src/lib-storage/index/cydir/cydir-mail.c
@@ -114,6 +114,8 @@ cydir_mail_get_stream(struct mail *_mail, struct message_size *hdr_size,
 		}
 		mail->data.stream =
 			i_stream_create_fd(fd, MAIL_READ_BLOCK_SIZE, TRUE);
+		i_stream_set_init_buffer_size(mail->data.stream,
+					      MAIL_READ_BLOCK_SIZE);
 	}
 
 	return index_mail_init_stream(mail, hdr_size, body_size, stream_r);
diff --git a/src/lib-storage/index/dbox/dbox-file.c b/src/lib-storage/index/dbox/dbox-file.c
index 7a0d54fd8a..ae2a5f246a 100644
--- a/src/lib-storage/index/dbox/dbox-file.c
+++ b/src/lib-storage/index/dbox/dbox-file.c
@@ -428,6 +428,7 @@ int dbox_file_open(struct dbox_file *file, bool *deleted_r)
 	}
 
 	file->input = i_stream_create_fd(file->fd, MAIL_READ_BLOCK_SIZE, FALSE);
+	i_stream_set_init_buffer_size(file->input, MAIL_READ_BLOCK_SIZE);
 	return file->maildir_file ? 1 :
 		dbox_file_read_header(file);
 }
diff --git a/src/lib-storage/index/maildir/maildir-mail.c b/src/lib-storage/index/maildir/maildir-mail.c
index 1acd7e2188..8ca6d075dd 100644
--- a/src/lib-storage/index/maildir/maildir-mail.c
+++ b/src/lib-storage/index/maildir/maildir-mail.c
@@ -45,6 +45,7 @@ maildir_open_mail(struct maildir_mailbox *mbox, struct mail *mail,
 		  bool *deleted_r)
 {
 	struct mail_private *p = (struct mail_private *)mail;
+	struct istream *input;
 	const char *path;
 	int fd = -1;
 
@@ -65,7 +66,9 @@ maildir_open_mail(struct maildir_mailbox *mbox, struct mail *mail,
 		return NULL;
 	}
 
-	return i_stream_create_fd(fd, MAIL_READ_BLOCK_SIZE, TRUE);
+	input = i_stream_create_fd(fd, MAIL_READ_BLOCK_SIZE, TRUE);
+	i_stream_set_init_buffer_size(input, MAIL_READ_BLOCK_SIZE);
+	return input;
 }
 
 static int maildir_mail_stat(struct mail *mail, struct stat *st)
diff --git a/src/lib-storage/index/mbox/mbox-file.c b/src/lib-storage/index/mbox/mbox-file.c
index 9149cbc325..4eb05bac2c 100644
--- a/src/lib-storage/index/mbox/mbox-file.c
+++ b/src/lib-storage/index/mbox/mbox-file.c
@@ -80,6 +80,8 @@ int mbox_file_open_stream(struct mbox_mailbox *mbox)
 			mbox->mbox_file_stream =
 				i_stream_create_fd(mbox->mbox_fd,
 						   MAIL_READ_BLOCK_SIZE, FALSE);
+			i_stream_set_init_buffer_size(mbox->mbox_file_stream,
+						      MAIL_READ_BLOCK_SIZE);
 		}
 	}
 
diff --git a/src/lib-storage/index/raw/raw-storage.c b/src/lib-storage/index/raw/raw-storage.c
index 36c600dd50..69a41a3ee6 100644
--- a/src/lib-storage/index/raw/raw-storage.c
+++ b/src/lib-storage/index/raw/raw-storage.c
@@ -86,6 +86,7 @@ static int raw_mailbox_open(struct mailbox *box)
 		return -1;
 	}
 	box->input = i_stream_create_fd(fd, MAIL_READ_BLOCK_SIZE, TRUE);
+	i_stream_set_init_buffer_size(box->input, MAIL_READ_BLOCK_SIZE);
 	return index_storage_mailbox_open(box);
 }