dovecot-1.2: mbox-snarf: Keep the mailbox locked while snarfing ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/cf93e420fc57
changeset: 9330:cf93e420fc57
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Aug 17 10:42:12 2009 -0400
description:
mbox-snarf: Keep the mailbox locked while snarfing to avoid duplicates.

diffstat:

1 file changed, 20 insertions(+), 28 deletions(-)
src/plugins/mbox-snarf/mbox-snarf-plugin.c |   48 +++++++++++-----------------

diffs (72 lines):

diff -r 956d2f962e97 -r cf93e420fc57 src/plugins/mbox-snarf/mbox-snarf-plugin.c
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Sat Aug 15 20:41:55 2009 -0400
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c	Mon Aug 17 10:42:12 2009 -0400
@@ -23,8 +23,6 @@ struct mbox_snarf_mail_storage {
 
 struct mbox_snarf_mailbox {
 	union mailbox_module_context module_ctx;
-
-	struct mailbox *spool_mbox;
 };
 
 const char *mbox_snarf_plugin_version = PACKAGE_VERSION;
@@ -108,31 +106,26 @@ mbox_snarf_sync_init(struct mailbox *box
 		MBOX_SNARF_CONTEXT(box->storage);
 	struct mail_storage *storage;
 	struct mbox_snarf_mailbox *mbox = MBOX_SNARF_CONTEXT(box);
-
-	if (mbox->spool_mbox == NULL) {
-		/* try to open the spool mbox */
-		mstorage->open_spool_inbox = TRUE;
-		storage = box->storage;
-		mbox->spool_mbox =
-			mailbox_open(&storage, "INBOX", NULL,
-				     MAILBOX_OPEN_KEEP_RECENT |
-				     MAILBOX_OPEN_NO_INDEX_FILES);
-		mstorage->open_spool_inbox = FALSE;
-	}
-
-	if (mbox->spool_mbox != NULL)
-		mbox_snarf(mbox->spool_mbox, box);
-
-	return mbox->module_ctx.super.sync_init(box, flags);
-}
-
-static int mbox_snarf_close(struct mailbox *box)
-{
-	struct mbox_snarf_mailbox *mbox = MBOX_SNARF_CONTEXT(box);
-
-	if (mbox->spool_mbox != NULL)
-		mailbox_close(&mbox->spool_mbox);
-	return mbox->module_ctx.super.close(box);
+	struct mailbox *spool_mbox;
+	static struct mailbox_sync_context *ctx;
+
+	/* try to open the spool mbox */
+	mstorage->open_spool_inbox = TRUE;
+	storage = box->storage;
+	spool_mbox = mailbox_open(&storage, "INBOX", NULL,
+				  MAILBOX_OPEN_KEEP_LOCKED |
+				  MAILBOX_OPEN_KEEP_RECENT |
+				  MAILBOX_OPEN_NO_INDEX_FILES);
+	mstorage->open_spool_inbox = FALSE;
+
+	if (spool_mbox != NULL)
+		mbox_snarf(spool_mbox, box);
+
+	ctx = mbox->module_ctx.super.sync_init(box, flags);
+
+	if (spool_mbox != NULL)
+		mailbox_close(&spool_mbox);
+	return ctx;
 }
 
 static struct mailbox *
@@ -178,7 +171,6 @@ mbox_snarf_mailbox_open(struct mail_stor
 	mbox->module_ctx.super = box->v;
 
 	box->v.sync_init = mbox_snarf_sync_init;
-	box->v.close = mbox_snarf_close;
 	MODULE_CONTEXT_SET(box, mbox_snarf_storage_module, mbox);
 	return box;
 }