From dca93c56e05ce631dd2f80da759f40c4d4b20ab5 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Tue, 24 Nov 2015 23:01:51 +0000
Subject: Do lock failures slightly better, return a special value so we don't
 unlink the wrong thing.

---
 server.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'server.c')

diff --git a/server.c b/server.c
index d950ed77..c45e8a2c 100644
--- a/server.c
+++ b/server.c
@@ -195,9 +195,11 @@ server_start(struct event_base *base, int lockfd, char *lockfile)
 	server_update_socket();
 	server_client_create(pair[1]);
 
-	unlink(lockfile);
-	free(lockfile);
-	close(lockfd);
+	if (lockfd >= 0) {
+		unlink(lockfile);
+		free(lockfile);
+		close(lockfd);
+	}
 
 	start_cfg();
 
-- 
cgit