summaryrefslogtreecommitdiffstats
path: root/server.c
diff options
context:
space:
mode:
authornicm <nicm>2015-11-24 23:01:51 +0000
committernicm <nicm>2015-11-24 23:01:51 +0000
commitdca93c56e05ce631dd2f80da759f40c4d4b20ab5 (patch)
treedf757790ff542e245f119f5b59c0e244f98567ee /server.c
parent73e30cbda8ade3a1c7ba3b771a911545826f76b7 (diff)
Do lock failures slightly better, return a special value so we don't
unlink the wrong thing.
Diffstat (limited to 'server.c')
-rw-r--r--server.c8
1 files changed, 5 insertions, 3 deletions
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();