dovecot-2.0: dbox: mail_attachment_min_size is now a setting (ra...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/8da1cfdb7932
changeset: 12240:8da1cfdb7932
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Aug 05 19:34:51 2010 +0100
description:
dbox: mail_attachment_min_size is now a setting (rather than hard-coded 0).

diffstat:

 src/lib-storage/index/dbox-common/dbox-attachment.c |  7 +++----
 src/lib-storage/index/dbox-common/dbox-storage.h    |  1 -
 src/lib-storage/mail-storage-settings.c             |  2 ++
 src/lib-storage/mail-storage-settings.h             |  1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r 4bcda3368b74 -r 8da1cfdb7932 src/lib-storage/index/dbox-common/dbox-attachment.c
--- a/src/lib-storage/index/dbox-common/dbox-attachment.c	Thu Aug 05 19:24:34 2010 +0100
+++ b/src/lib-storage/index/dbox-common/dbox-attachment.c	Thu Aug 05 19:34:51 2010 +0100
@@ -205,8 +205,7 @@
 static void dbox_save_body(struct dbox_save_context *ctx,
 			   const struct message_block *block)
 {
-	struct dbox_storage *storage =
-		(struct dbox_storage *)ctx->ctx.transaction->box->storage;
+	struct mail_storage *storage = ctx->ctx.transaction->box->storage;
 	buffer_t *part_buf;
 	size_t new_size;
 
@@ -218,11 +217,11 @@
 		if (ctx->attach.part_buf == NULL) {
 			ctx->attach.part_buf =
 				buffer_create_dynamic(default_pool,
-						storage->attachment_min_size);
+					storage->set->mail_attachment_min_size);
 		}
 		part_buf = ctx->attach.part_buf;
 		new_size = part_buf->used + block->size;
-		if (new_size < storage->attachment_min_size) {
+		if (new_size < storage->set->mail_attachment_min_size) {
 			buffer_append(part_buf, block->data, block->size);
 			break;
 		}
diff -r 4bcda3368b74 -r 8da1cfdb7932 src/lib-storage/index/dbox-common/dbox-storage.h
--- a/src/lib-storage/index/dbox-common/dbox-storage.h	Thu Aug 05 19:24:34 2010 +0100
+++ b/src/lib-storage/index/dbox-common/dbox-storage.h	Thu Aug 05 19:34:51 2010 +0100
@@ -55,7 +55,6 @@
 
 	struct fs *attachment_fs;
 	const char *attachment_dir;
-	unsigned int attachment_min_size;
 };
 
 void dbox_storage_get_list_settings(const struct mail_namespace *ns,
diff -r 4bcda3368b74 -r 8da1cfdb7932 src/lib-storage/mail-storage-settings.c
--- a/src/lib-storage/mail-storage-settings.c	Thu Aug 05 19:24:34 2010 +0100
+++ b/src/lib-storage/mail-storage-settings.c	Thu Aug 05 19:34:51 2010 +0100
@@ -25,6 +25,7 @@
 	{ SET_ALIAS, "mail", 0, NULL },
 	DEF(SET_STR_VARS, mail_attachment_fs),
 	DEF(SET_STR_VARS, mail_attachment_dir),
+	DEF(SET_SIZE, mail_attachment_min_size),
 	DEF(SET_STR, mail_cache_fields),
 	DEF(SET_STR, mail_never_cache_fields),
 	DEF(SET_UINT, mail_cache_min_mail_count),
@@ -51,6 +52,7 @@
 	.mail_location = "",
 	.mail_attachment_fs = "sis posix",
 	.mail_attachment_dir = "",
+	.mail_attachment_min_size = 1024*128,
 	.mail_cache_fields = "flags",
 	.mail_never_cache_fields = "imap.envelope",
 	.mail_cache_min_mail_count = 0,
diff -r 4bcda3368b74 -r 8da1cfdb7932 src/lib-storage/mail-storage-settings.h
--- a/src/lib-storage/mail-storage-settings.h	Thu Aug 05 19:24:34 2010 +0100
+++ b/src/lib-storage/mail-storage-settings.h	Thu Aug 05 19:34:51 2010 +0100
@@ -13,6 +13,7 @@
 	const char *mail_location;
 	const char *mail_attachment_fs;
 	const char *mail_attachment_dir;
+	unsigned int mail_attachment_min_size;
 	const char *mail_cache_fields;
 	const char *mail_never_cache_fields;
 	unsigned int mail_cache_min_mail_count;