oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

daemon: pass "detach" flag to daemonize()

Browse Source 
This way, we don't have to pass the full "Options" object to
daemonize().
This commit is contained in:
Max Kellermann 2009-01-18 18:29:30 +01:00
parent bfcaecabbd
commit 9c93249412
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/daemon.c
View File

@ -18,7 +18,8 @@
#include "daemon.h" #include "daemon.h"
#include <stdbool.h> #include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
@ -133,7 +134,7 @@ daemonize_set_user(void)
} }
void void
daemonize(Options *options) daemonize(bool detach)
{ {
#ifndef WIN32 #ifndef WIN32
FILE *fp = NULL; FILE *fp = NULL;
@ -149,7 +150,7 @@ daemonize(Options *options)
} }
} }
if (options->daemon) { if (detach) {
int pid; int pid;
fflush(NULL); fflush(NULL);

4
src/daemon.h
View File

@ -19,7 +19,7 @@
#ifndef DAEMON_H #ifndef DAEMON_H
#define DAEMON_H #define DAEMON_H
#include "cmdline.h" #include <stdbool.h>
void void
daemonize_init(const char *user, const char *pidfile); daemonize_init(const char *user, const char *pidfile);
@ -47,6 +47,6 @@ void
daemonize_set_user(void); daemonize_set_user(void);
void void
daemonize(Options *options); daemonize(bool detach);
#endif #endif

2
src/main.c
View File

@ -245,7 +245,7 @@ int main(int argc, char *argv[])
initNormalization(); initNormalization();
input_stream_global_init(); input_stream_global_init();
daemonize(&options); daemonize(options.daemon);
setup_log_output(options.stdOutput); setup_log_output(options.stdOutput);