diff src/lib-storage/index/maildir/maildir-storage.c @ 6408:17ec931b51d7 HEAD

Added maildir_keywords_init_readonly() which can be used to read the keywords file from non-maildir mailboxes.
author Timo Sirainen <tss@iki.fi>
date Sun, 16 Sep 2007 11:02:48 +0300
parents 1c90552923ba
children 7f733ba453bf
line wrap: on
line diff
--- a/src/lib-storage/index/maildir/maildir-storage.c	Sun Sep 16 10:56:32 2007 +0300
+++ b/src/lib-storage/index/maildir/maildir-storage.c	Sun Sep 16 11:02:48 2007 +0300
@@ -468,7 +468,6 @@
 	mbox->control_dir = p_strdup(pool, control_dir);
 
 	mbox->uidlist = maildir_uidlist_init(mbox);
-	mbox->keywords = maildir_keywords_init(mbox);
 
 	mbox->maildir_ext_id =
 		mail_index_ext_register(index, "maildir",
@@ -501,6 +500,8 @@
 	if (access(t_strconcat(path, "/cur", NULL), W_OK) < 0 &&
 	    errno == EACCES)
 		mbox->ibox.readonly = TRUE;
+
+	mbox->keywords = maildir_keywords_init(mbox);
 	t_pop();
 	return &mbox->ibox.box;
 }
@@ -851,7 +852,8 @@
 		timeout_remove(&mbox->keep_lock_to);
 	}
 
-	maildir_keywords_deinit(mbox->keywords);
+	if (mbox->keywords != NULL)
+		maildir_keywords_deinit(mbox->keywords);
 	maildir_uidlist_deinit(mbox->uidlist);
 	return index_storage_mailbox_close(box);
 }