dovecot-1.1: maildir: We didn't properly handle missing control ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-1.1/rev/b9262c72f168
changeset: 8171:b9262c72f168
user:      Timo Sirainen <tss at iki.fi>
date:      Mon Feb 23 13:40:01 2009 -0500
description:
maildir: We didn't properly handle missing control directory at startup.
Also some other error handling when some dirs were missing were done wrong.

diffstat:

3 files changed, 5 insertions(+), 5 deletions(-)
src/lib-storage/index/maildir/maildir-keywords.c |    2 +-
src/lib-storage/index/maildir/maildir-sync.c     |    4 ++--
src/lib-storage/index/maildir/maildir-uidlist.c  |    4 ++--

diffs (54 lines):

diff -r 2b0043ba89ae -r b9262c72f168 src/lib-storage/index/maildir/maildir-keywords.c
--- a/src/lib-storage/index/maildir/maildir-keywords.c	Sat Feb 21 17:07:11 2009 -0500
+++ b/src/lib-storage/index/maildir/maildir-keywords.c	Mon Feb 23 13:40:01 2009 -0500
@@ -373,7 +373,7 @@ static int maildir_keywords_commit(struc
 		}
 		/* the control dir doesn't exist. create it unless the whole
 		   mailbox was just deleted. */
-		if (maildir_set_deleted(mk->mbox))
+		if (!maildir_set_deleted(mk->mbox))
 			return -1;
 	}
 
diff -r 2b0043ba89ae -r b9262c72f168 src/lib-storage/index/maildir/maildir-sync.c
--- a/src/lib-storage/index/maildir/maildir-sync.c	Sat Feb 21 17:07:11 2009 -0500
+++ b/src/lib-storage/index/maildir/maildir-sync.c	Mon Feb 23 13:40:01 2009 -0500
@@ -344,7 +344,7 @@ maildir_stat(struct maildir_mailbox *mbo
 		if (errno != ENOENT || i == MAILDIR_DELETE_RETRY_COUNT)
 			break;
 
-		if (maildir_set_deleted(mbox))
+		if (!maildir_set_deleted(mbox))
 			return -1;
 		/* try again */
 	}
@@ -380,7 +380,7 @@ static int maildir_scan_dir(struct maild
 			return -1;
 		}
 
-		if (maildir_set_deleted(ctx->mbox))
+		if (!maildir_set_deleted(ctx->mbox))
 			return -1;
 		/* try again */
 	}
diff -r 2b0043ba89ae -r b9262c72f168 src/lib-storage/index/maildir/maildir-uidlist.c
--- a/src/lib-storage/index/maildir/maildir-uidlist.c	Sat Feb 21 17:07:11 2009 -0500
+++ b/src/lib-storage/index/maildir/maildir-uidlist.c	Mon Feb 23 13:40:01 2009 -0500
@@ -164,7 +164,7 @@ static int maildir_uidlist_lock_timeout(
 		}
 		/* the control dir doesn't exist. create it unless the whole
 		   mailbox was just deleted. */
-		if (maildir_set_deleted(uidlist->mbox))
+		if (!maildir_set_deleted(uidlist->mbox))
 			return -1;
 	}
 
@@ -1113,7 +1113,7 @@ static int maildir_uidlist_recreate(stru
 		}
 		/* the control dir doesn't exist. create it unless the whole
 		   mailbox was just deleted. */
-		if (maildir_set_deleted(uidlist->mbox))
+		if (!maildir_set_deleted(uidlist->mbox))
 			return -1;
 	}