dovecot-1.2: Maildir: Make sure messages are removed from index ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.2/rev/e7792f4509e6
changeset: 9067:e7792f4509e6
user:      Timo Sirainen <tss at iki.fi>
date:      Wed May 20 17:47:49 2009 -0400
description:
Maildir: Make sure messages are removed from index if they are deleted externally from new/.
The problem happened when a message in new/ was indexed, deleted externally
and the mailbox was again opened as read-only. This caused a partial sync
in new/ directory, which didn't notice that the files were gone.

diffstat:

1 file changed, 13 insertions(+), 7 deletions(-)
src/lib-storage/index/maildir/maildir-sync.c |   20 +++++++++++++-------

diffs (39 lines):

diff -r a31fb9b7179a -r e7792f4509e6 src/lib-storage/index/maildir/maildir-sync.c
--- a/src/lib-storage/index/maildir/maildir-sync.c	Wed May 20 14:04:25 2009 -0400
+++ b/src/lib-storage/index/maildir/maildir-sync.c	Wed May 20 17:47:49 2009 -0400
@@ -643,12 +643,9 @@ static void maildir_sync_update_next_uid
 	}
 }
 
-static bool move_recent_messages(struct maildir_sync_context *ctx)
+static bool have_recent_messages(struct maildir_sync_context *ctx)
 {
 	const struct mail_index_header *hdr;
-
-	if (ctx->mbox->ibox.keep_recent)
-		return FALSE;
 
 	(void)maildir_uidlist_refresh(ctx->mbox->uidlist);
 
@@ -673,9 +670,18 @@ static int maildir_sync_get_changes(stru
 	if (*new_changed_r || *cur_changed_r)
 		return 1;
 
-	if (move_recent_messages(ctx)) {
-		*new_changed_r = TRUE;
-		return 1;
+	if (have_recent_messages(ctx)) {
+		if (!ctx->mbox->ibox.keep_recent) {
+			*new_changed_r = TRUE;
+			return 1;
+		} else if (*new_changed_r) {
+			/* we have some recent messages and new/ has changed.
+			   if messages had been externally deleted from new/,
+			   we need to get them out of index. this requires that
+			   we make sure they weren't just moved to cur/. */
+			*cur_changed_r = TRUE;
+			return 1;
+		}
 	}
 
 	if (!ctx->mbox->ibox.keep_recent)