lib: Add file_lock_set_close_on_free()

diff --git a/src/lib/file-lock.c b/src/lib/file-lock.c
index 3478fa829e53ed7677bb3ac3f965e6b2140d2fca..445caf8c7fdd98e2333fc7d2ff454657c5466d97 100644 (file)
--- a/src/lib/file-lock.c
+++ b/src/lib/file-lock.c
@@ -19,6 +19,7 @@ struct file_lock {
        int lock_type;
        enum file_lock_method lock_method;
        bool unlink_on_free;
+       bool close_on_free;
 };
 
 static struct timeval lock_wait_start;
@@ -346,6 +347,11 @@ void file_lock_set_unlink_on_free(struct file_lock *lock, bool set)
        lock->unlink_on_free = set;
 }
 
+void file_lock_set_close_on_free(struct file_lock *lock, bool set)
+{
+       lock->close_on_free = set;
+}
+
 void file_unlock(struct file_lock **_lock)
 {
        struct file_lock *lock = *_lock;
@@ -375,6 +381,8 @@ void file_lock_free(struct file_lock **_lock)
 
        if (lock->unlink_on_free)
                i_unlink(lock->path);
+       if (lock->close_on_free)
+               i_close_fd(&lock->fd);
 
        file_lock_log_warning_if_slow(lock);
        i_free(lock->path);

diff --git a/src/lib/file-lock.h b/src/lib/file-lock.h
index 377abdbf8cf8997c8131443a09b033e9f136a8b3..022210600a0b0c7f7948792adbc2674c415a9936 100644 (file)
--- a/src/lib/file-lock.h
+++ b/src/lib/file-lock.h
@@ -48,6 +48,9 @@ int file_lock_try_update(struct file_lock *lock, int lock_type);
 /* When the lock is freed, unlink() the file automatically. This can be useful
    for files that are only created to exist as lock files. */
 void file_lock_set_unlink_on_free(struct file_lock *lock, bool set);
+/* When the lock is freed, close the fd automatically. This can
+   be useful for files that are only created to exist as lock files. */
+void file_lock_set_close_on_free(struct file_lock *lock, bool set);
 
 /* Unlock and free the lock. */
 void file_unlock(struct file_lock **lock);