[dovecot-cvs] dovecot/src/lib-storage/index/dbox
dbox-sync-expunge.c, 1.5, 1.6 dbox-uidlist.c, 1.15, 1.16
cras at dovecot.org
cras at dovecot.org
Sun Feb 5 15:07:10 EET 2006
Update of /var/lib/cvs/dovecot/src/lib-storage/index/dbox
In directory talvi:/tmp/cvs-serv31767/lib-storage/index/dbox
Modified Files:
dbox-sync-expunge.c dbox-uidlist.c
Log Message:
Dotlock fixes
Index: dbox-sync-expunge.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-sync-expunge.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- dbox-sync-expunge.c 14 Jan 2006 18:47:46 -0000 1.5
+++ dbox-sync-expunge.c 5 Feb 2006 13:07:08 -0000 1.6
@@ -13,15 +13,16 @@
#include <stddef.h>
static const struct dotlock_settings new_file_dotlock_set = {
- NULL,
- NULL,
+ MEMBER(temp_prefix) NULL,
+ MEMBER(lock_suffix) NULL,
- 30, 5, 5,
+ MEMBER(timeout) 60,
+ MEMBER(stale_timeout) 30,
- NULL,
- NULL,
+ MEMBER(callback) NULL,
+ MEMBER(context) NULL,
- FALSE
+ 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));
Index: dbox-uidlist.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/lib-storage/index/dbox/dbox-uidlist.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- dbox-uidlist.c 29 Jan 2006 09:54:32 -0000 1.15
+++ dbox-uidlist.c 5 Feb 2006 13:07:08 -0000 1.16
@@ -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)
More information about the dovecot-cvs
mailing list