From: Timo Sirainen <tss@iki.fi>
Date: Sat, 12 Apr 2003 14:53:43 +0000 (+0300)
Subject: Expunging mails broke syncing
X-Git-Tag: 1.1.alpha1~4754
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c570f37c8e1a6064bffde4ea2250ab804182e371;p=thirdparty%2Fdovecot%2Fcore.git

Expunging mails broke syncing

--HG--
branch : HEAD
---

diff --git a/src/lib-index/maildir/maildir-sync.c b/src/lib-index/maildir/maildir-sync.c
index 07d7b95312..edce7ead71 100644
--- a/src/lib-index/maildir/maildir-sync.c
+++ b/src/lib-index/maildir/maildir-sync.c
@@ -153,7 +153,7 @@ static int maildir_sync_uidlist(struct mail_index *index, const char *dir,
         struct maildir_uidlist_rec uid_rec;
 	const char *fname, **new_files;
 	void *orig_key, *orig_value;
-	unsigned int seq, last_uid, i;
+	unsigned int seq, uid, last_uid, i;
 	buffer_t *buf;
 
         seq = 0;
@@ -167,10 +167,10 @@ static int maildir_sync_uidlist(struct mail_index *index, const char *dir,
 	}
 
 	while (rec != NULL) {
-		seq++;
+		seq++; uid = rec->uid;
 
 		/* skip over the expunged records in uidlist */
-		while (uid_rec.uid != 0 && uid_rec.uid < rec->uid) {
+		while (uid_rec.uid != 0 && uid_rec.uid < uid) {
 			uidlist->rewrite = TRUE;
 			if (!maildir_uidlist_next(uidlist, &uid_rec))
 				return FALSE;
@@ -189,10 +189,10 @@ static int maildir_sync_uidlist(struct mail_index *index, const char *dir,
 			return FALSE;
 		}
 
-		if (uid_rec.uid != 0 &&
+		if (uid_rec.uid == uid &&
 		    maildir_cmp(fname, uid_rec.filename) != 0) {
 			index_set_corrupted(index, "Filename mismatch for UID "
-					    "%u: %s vs %s", rec->uid, fname,
+					    "%u: %s vs %s", uid, fname,
 					    uid_rec.filename);
 			return FALSE;
 		}
@@ -220,7 +220,7 @@ static int maildir_sync_uidlist(struct mail_index *index, const char *dir,
 			i_unreached();
 		}
 
-		if (uid_rec.uid != 0) {
+		if (uid_rec.uid != 0 && uid_rec.uid <= uid) {
 			if (maildir_uidlist_next(uidlist, &uid_rec) < 0)
 				return FALSE;
 		}