summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-08-17 16:06:40 -0400
committerJune McEnroe <june@causal.agency>2020-08-17 16:06:40 -0400
commitea96ef48cbf4980b7dd3dd61f944091ead821f20 (patch)
tree2433e257989c06aa679e3a8983f0f921093d9bdd
parentTruncate PID file after opening and locking (diff)
downloadcatsit-ea96ef48cbf4980b7dd3dd61f944091ead821f20.tar.gz
catsit-ea96ef48cbf4980b7dd3dd61f944091ead821f20.zip
Use a non-blocking lock on the PID file
-rw-r--r--daemon.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/daemon.c b/daemon.c
index 1643200..a1be594 100644
--- a/daemon.c
+++ b/daemon.c
@@ -247,11 +247,13 @@ int main(int argc, char *argv[]) {
 
 	int pidFile = -1;
 	if (pidPath) {
-		pidFile = open(
-			pidPath, O_WRONLY | O_CREAT | O_EXLOCK | O_CLOEXEC, 0600
-		);
+		pidFile = open(pidPath, O_WRONLY | O_CREAT | O_CLOEXEC, 0600);
 		if (pidFile < 0) err(EX_CANTCREAT, "%s", pidPath);
 
+		error = flock(pidFile, LOCK_EX | LOCK_NB);
+		if (error && errno != EWOULDBLOCK) err(EX_IOERR, "%s", pidPath);
+		if (error) errx(EX_CANTCREAT, "%s: file is locked", pidPath);
+
 		error = ftruncate(pidFile, 0);
 		if (error) err(EX_IOERR, "%s", pidPath);
 	}
='logheader'>2021-01-13Match strftime format specifiersJune McEnroe 2021-01-13Switch git.causal.agency to hilex and htagmlJune McEnroe Still missing a shell lexer in hilex, but well... it's shell. 2021-01-13Try to return make substitutions as single tokensJune McEnroe 2021-01-13Shorten hilex class namesJune McEnroe 2021-01-13Move text "lexer" to hilex.cJune McEnroe 2021-01-13Try to return strings as single tokensJune McEnroe 2021-01-13Match [] as Operator in C lexerJune McEnroe 2021-01-13Fix C lexer to require a digit in a float literalJune McEnroe Otherwise ".l" is matched as Number. 2021-01-13Support long double in c.shJune McEnroe 2021-01-13Update Terminal.app coloursJune McEnroe God what is this garbage I only changed one colour. 2021-01-13Increase dark white brightness slightlyJune McEnroe 2021-01-13Add hilex example to htagml manualJune McEnroe 2021-01-12Style causal.agency like bin HTMLJune McEnroe 2021-01-12Avoid matching tag text inside HTML elementsJune McEnroe 2021-01-12Use hilex for up -hJune McEnroe 2021-01-12Use hilex for bin HTMLJune McEnroe 2021-01-12Don't output a pre in hilex by defaultJune McEnroe 2021-01-12Move hilex out of hilex directoryJune McEnroe 2021-01-12Consolidate hilex formatters into hilex.cJune McEnroe 2021-01-12Remove hacky tagging from hilexJune McEnroe God that makes the lexers so much simpler. 2021-01-12Add htagml -iJune McEnroe 2021-01-12Render tag index in HTMLJune McEnroe 2021-01-12Add htagml -xJune McEnroe 2021-01-12Prevent matching the same tag twiceJune McEnroe 2021-01-12Process htagml file line by lineJune McEnroe This simplifies some things, adds support for line number tag definitions, and should enable combining htagml with other preprocessors in the future. 2021-01-12Split fields by tab onlyJune McEnroe Also don't fail hard on non-forward-search definitions. 2021-01-12List both Makefile and html.sh under README.7June McEnroe 2021-01-12Add htagml exampleJune McEnroe 2021-01-12Use mandoc and htagml for bin htmlJune McEnroe 2021-01-12Add htagmlJune McEnroe 2021-01-12Replace causal.agency with a simple mdoc pageJune McEnroe 2021-01-11Publish "Using vi"June McEnroe 2021-01-11Enable diff.colorMovedJune McEnroe 2021-01-10Set less search case-insensitiveJune McEnroe 2021-01-10Set EXINITJune McEnroe neovim is laggy as hell in my OpenBSD VM, so I switched to vi so I could type without getting frustrated. 2021-01-09Add c -t flag to print expression typeJune McEnroe Also add missing float case. 2021-01-05Update taglineJune McEnroe