daemon: pass "detach" flag to daemonize()

This way, we don't have to pass the full "Options" object to
daemonize().

3 files changed, 7 insertions, 6 deletions

diff --git a/src/daemon.c b/src/daemon.c
index 671e44a0..02365597 100644
--- a/src/daemon.c
+++ b/src/daemon.c
@@ -18,7 +18,8 @@
 
 #include "daemon.h"
 
-#include <stdbool.h>
+#include <glib.h>
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -133,7 +134,7 @@ daemonize_set_user(void)
 }
 
 void
-daemonize(Options *options)
+daemonize(bool detach)
 {
 #ifndef WIN32
 	FILE *fp = NULL;
@@ -149,7 +150,7 @@ daemonize(Options *options)
 		}
 	}
 
-	if (options->daemon) {
+	if (detach) {
 		int pid;
 
 		fflush(NULL);
diff --git a/src/daemon.h b/src/daemon.h
index 96963015..b58160d3 100644
--- a/src/daemon.h
+++ b/src/daemon.h
@@ -19,7 +19,7 @@
 #ifndef DAEMON_H
 #define DAEMON_H
 
-#include "cmdline.h"
+#include <stdbool.h>
 
 void
 daemonize_init(const char *user, const char *pidfile);
@@ -47,6 +47,6 @@ void
 daemonize_set_user(void);
 
 void
-daemonize(Options *options);
+daemonize(bool detach);
 
 #endif
diff --git a/src/main.c b/src/main.c
index b42433ec..449a9f74 100644
--- a/src/main.c
+++ b/src/main.c
@@ -245,7 +245,7 @@ int main(int argc, char *argv[])
 	initNormalization();
 	input_stream_global_init();
 
-	daemonize(&options);
+	daemonize(options.daemon);
 
 	setup_log_output(options.stdOutput);