[dovecot-cvs] dovecot/src/lib-storage/index/maildir maildir-uidlist.c, 1.10, 1.11

cras at procontrol.fi cras at procontrol.fi
Tue May 4 01:08:28 EEST 2004


Update of /home/cvs/dovecot/src/lib-storage/index/maildir
In directory talvi:/tmp/cvs-serv19265/lib-storage/index/maildir

Modified Files:
	maildir-uidlist.c 
Log Message:
file_dotlock_open/delete/replace now has lock_suffix parameter. NULL
defaults to ".lock".

Fixed dotlocking transaction log.



Index: maildir-uidlist.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib-storage/index/maildir/maildir-uidlist.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- maildir-uidlist.c	3 May 2004 21:08:04 -0000	1.10
+++ maildir-uidlist.c	3 May 2004 22:08:26 -0000	1.11
@@ -77,8 +77,8 @@
 	path = t_strconcat(uidlist->ibox->control_dir,
 			   "/" MAILDIR_UIDLIST_NAME, NULL);
         old_mask = umask(0777 & ~uidlist->ibox->mail_create_mode);
-	fd = file_dotlock_open(path, NULL, 0, 0, UIDLIST_LOCK_STALE_TIMEOUT,
-			       NULL, NULL);
+	fd = file_dotlock_open(path, NULL, NULL, 0, 0,
+			       UIDLIST_LOCK_STALE_TIMEOUT, NULL, NULL);
 	umask(old_mask);
 	if (fd == -1) {
 		if (errno == EAGAIN)
@@ -101,7 +101,7 @@
 
 	path = t_strconcat(uidlist->ibox->control_dir,
 			   "/" MAILDIR_UIDLIST_NAME, NULL);
-	(void)file_dotlock_delete(path, uidlist->lock_fd);
+	(void)file_dotlock_delete(path, NULL, uidlist->lock_fd);
 	uidlist->lock_fd = -1;
 }
 
@@ -482,7 +482,7 @@
 		db_path = t_strconcat(ibox->control_dir,
 				      "/" MAILDIR_UIDLIST_NAME, NULL);
 
-		if (file_dotlock_replace(db_path, uidlist->lock_fd,
+		if (file_dotlock_replace(db_path, NULL, uidlist->lock_fd,
 					 FALSE) <= 0) {
 			mail_storage_set_critical(ibox->box.storage,
 				"file_dotlock_replace(%s) failed: %m", db_path);



More information about the dovecot-cvs mailing list