From: Timo Sirainen <tss@iki.fi>
Date: Mon, 17 Aug 2009 14:45:29 +0000 (-0400)
Subject: mbox-snarf: Keep the mailbox locked while snarfing to avoid duplicates.
X-Git-Tag: 2.0.alpha1~251
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae2b82c2cfa8443c14d361f42245c31eacc08064;p=thirdparty%2Fdovecot%2Fcore.git

mbox-snarf: Keep the mailbox locked while snarfing to avoid duplicates.

--HG--
branch : HEAD
---

diff --git a/src/plugins/mbox-snarf/mbox-snarf-plugin.c b/src/plugins/mbox-snarf/mbox-snarf-plugin.c
index f89345c24d..6d85a02e49 100644
--- a/src/plugins/mbox-snarf/mbox-snarf-plugin.c
+++ b/src/plugins/mbox-snarf/mbox-snarf-plugin.c
@@ -24,8 +24,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,28 +106,20 @@ mbox_snarf_sync_init(struct mailbox *box, enum mailbox_sync_flags flags)
 	struct mbox_snarf_mail_storage *mstorage =
 		MBOX_SNARF_CONTEXT(box->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;
-		mbox->spool_mbox =
-			mailbox_alloc(box->list, "INBOX", NULL,
-				      MAILBOX_FLAG_KEEP_RECENT |
-				      MAILBOX_FLAG_NO_INDEX_FILES);
-		mstorage->open_spool_inbox = FALSE;
-	}
-	(void)mbox_snarf(mbox->spool_mbox, box);
-
-	return mbox->module_ctx.super.sync_init(box, flags);
-}
-
-static void 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);
-	mbox->module_ctx.super.close(box);
+	struct mailbox *spool_mbox;
+	struct mailbox_sync_context *ctx;
+
+	/* try to open the spool mbox */
+	mstorage->open_spool_inbox = TRUE;
+	spool_mbox = mailbox_alloc(box->list, "INBOX", NULL,
+				   MAILBOX_FLAG_KEEP_RECENT |
+				   MAILBOX_FLAG_NO_INDEX_FILES);
+	mstorage->open_spool_inbox = FALSE;
+	(void)mbox_snarf(spool_mbox, box);
+
+	ctx = mbox->module_ctx.super.sync_init(box, flags);
+	mailbox_close(&spool_mbox);
+	return ctx;
 }
 
 static struct mailbox *
@@ -174,7 +164,6 @@ mbox_snarf_mailbox_alloc(struct mail_storage *storage,
 	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;
 }