Mercurial > dovecot > core-2.2
changeset 3985:38c352bb7bb7 HEAD
Dotlock fixes
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Sun, 05 Feb 2006 15:07:08 +0200 |
| parents | 882ec6cc5970 |
| children | dd389a881380 |
| files | src/lib-storage/index/dbox/dbox-sync-expunge.c src/lib-storage/index/dbox/dbox-uidlist.c |
| diffstat | 2 files changed, 26 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lib-storage/index/dbox/dbox-sync-expunge.c Sun Feb 05 15:03:40 2006 +0200 +++ b/src/lib-storage/index/dbox/dbox-sync-expunge.c Sun Feb 05 15:07:08 2006 +0200 @@ -13,15 +13,16 @@ #include <stddef.h> static const struct dotlock_settings new_file_dotlock_set = { - NULL, - NULL, - - 30, 5, 5, + MEMBER(temp_prefix) NULL, + MEMBER(lock_suffix) NULL, - NULL, - NULL, + MEMBER(timeout) 60, + MEMBER(stale_timeout) 30, - FALSE + MEMBER(callback) NULL, + MEMBER(context) NULL, + + MEMBER(use_excl_lock) FALSE }; static int @@ -112,6 +113,8 @@ DBOX_MAIL_FILE_PREFIX"%u", mbox->path, file_seq); fd = file_dotlock_open(&new_file_dotlock_set, path, 0, &dotlock); + if (fd < 0) + return -1; output = o_stream_create_file(fd, default_pool, 0, FALSE); memset(&dest_entry, 0, sizeof(dest_entry));
--- a/src/lib-storage/index/dbox/dbox-uidlist.c Sun Feb 05 15:03:40 2006 +0200 +++ b/src/lib-storage/index/dbox/dbox-uidlist.c Sun Feb 05 15:07:08 2006 +0200 @@ -82,21 +82,29 @@ }; const struct dotlock_settings uidlist_dotlock_settings = { - NULL, NULL, + MEMBER(temp_prefix) NULL, + MEMBER(lock_suffix) NULL, - 60, 30, 120, + MEMBER(timeout) 120, + MEMBER(stale_timeout) 60, - NULL, NULL, - FALSE + MEMBER(callback) NULL, + MEMBER(context) NULL, + + MEMBER(use_excl_lock) FALSE }; const struct dotlock_settings dbox_file_dotlock_set = { - NULL, NULL, + MEMBER(temp_prefix) NULL, + MEMBER(lock_suffix) NULL, - 60, 30, 120, + MEMBER(timeout) 120, + MEMBER(stale_timeout) 60, - NULL, NULL, - FALSE + MEMBER(callback) NULL, + MEMBER(context) NULL, + + MEMBER(use_excl_lock) FALSE }; struct dbox_uidlist *dbox_uidlist_init(struct dbox_mailbox *mbox)