[dovecot-cvs] dovecot/src/lib-storage/index/maildir
maildir-storage.c, 1.103, 1.104 maildir-uidlist.c, 1.40, 1.41
cras at dovecot.org
cras at dovecot.org
Mon Aug 15 00:54:27 EEST 2005
Update of /var/lib/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv17029/lib-storage/index/maildir
Modified Files:
maildir-storage.c maildir-uidlist.c
Log Message:
New inotify code and notify API change. Patch by Johannes Berg
Index: maildir-storage.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-storage.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- maildir-storage.c 22 Jul 2005 14:32:27 -0000 1.103
+++ maildir-storage.c 14 Aug 2005 21:54:25 -0000 1.104
@@ -853,9 +853,9 @@
}
index_mailbox_check_add(&mbox->ibox,
- t_strconcat(mbox->path, "/new", NULL), TRUE);
+ t_strconcat(mbox->path, "/new", NULL));
index_mailbox_check_add(&mbox->ibox,
- t_strconcat(mbox->path, "/cur", NULL), TRUE);
+ t_strconcat(mbox->path, "/cur", NULL));
}
struct mail_storage maildir_storage = {
Index: maildir-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- maildir-uidlist.c 14 Aug 2005 19:02:54 -0000 1.40
+++ maildir-uidlist.c 14 Aug 2005 21:54:25 -0000 1.41
@@ -826,6 +826,7 @@
int maildir_uidlist_sync_deinit(struct maildir_uidlist_sync_ctx *ctx)
{
+ int unlocked = FALSE;
int ret = ctx->failed ? -1 : 0;
if (!ctx->finished)
@@ -844,13 +845,15 @@
t_push();
ret = maildir_uidlist_rewrite(ctx->uidlist);
t_pop();
+ unlocked = TRUE;
if (ret == 0)
ctx->uidlist->need_rewrite = FALSE;
}
}
- maildir_uidlist_unlock(ctx->uidlist);
+ if (!unlocked)
+ maildir_uidlist_unlock(ctx->uidlist);
if (ctx->files != NULL)
hash_destroy(ctx->files);
More information about the dovecot-cvs
mailing list