aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2009-01-18 18:29:30 +0100
committerMax Kellermann <max@duempel.org>2009-01-18 18:29:30 +0100
commit9c93249412076dcf52732561b0f6150c3e8000d8 (patch)
tree262d80c2920a0119d1413298a9f2e1fef2954c40 /src
parentbfcaecabbda1ec9473a92f6a413a51db564d9d6e (diff)
downloadmpd-9c93249412076dcf52732561b0f6150c3e8000d8.tar.gz
mpd-9c93249412076dcf52732561b0f6150c3e8000d8.tar.xz
mpd-9c93249412076dcf52732561b0f6150c3e8000d8.zip
daemon: pass "detach" flag to daemonize()
This way, we don't have to pass the full "Options" object to daemonize().
Diffstat (limited to 'src')
-rw-r--r--src/daemon.c7
-rw-r--r--src/daemon.h4
-rw-r--r--src/main.c2
3 files changed, 7 insertions, 6 deletions
diff --git a/src/daemon.c b/src/daemon.c
index 671e44a0c..023655979 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 969630156..b58160d32 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 b42433ec8..449a9f747 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);