diff options
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/daemon.c | 86 | ||||
| -rw-r--r-- | src/daemon.h | 27 | ||||
| -rw-r--r-- | src/main.c | 60 |
4 files changed, 116 insertions, 59 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 9f6c8ea35..f9fe0b0cf 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -44,6 +44,7 @@ mpd_headers = \ log.h \ ls.h \ main_notify.h \ + daemon.h \ normalize.h \ compress.h \ pipe.h \ @@ -126,6 +127,7 @@ mpd_SOURCES = \ ls.c \ main.c \ main_notify.c \ + daemon.c \ normalize.c \ compress.c \ pipe.c \ diff --git a/src/daemon.c b/src/daemon.c new file mode 100644 index 000000000..09cd5721a --- /dev/null +++ b/src/daemon.c @@ -0,0 +1,86 @@ +/* + * Copyright (C) 2003-2008 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "daemon.h" +#include "conf.h" + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <errno.h> +#include <string.h> + +void +daemonize(Options *options) +{ +#ifndef WIN32 + FILE *fp = NULL; + ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0); + + if (pidFileParam) { + /* do this before daemon'izing so we can fail gracefully if we can't + * write to the pid file */ + g_debug("opening pid file"); + fp = fopen(pidFileParam->value, "w+"); + if (!fp) { + g_error("could not open %s \"%s\" (at line %i) for writing: %s", + CONF_PID_FILE, pidFileParam->value, + pidFileParam->line, strerror(errno)); + } + } + + if (options->daemon) { + int pid; + + fflush(NULL); + pid = fork(); + if (pid > 0) + _exit(EXIT_SUCCESS); + else if (pid < 0) { + g_error("problems fork'ing for daemon!"); + } + + if (chdir("/") < 0) { + g_error("problems changing to root directory"); + } + + if (setsid() < 0) { + g_error("problems setsid'ing"); + } + + fflush(NULL); + pid = fork(); + if (pid > 0) + _exit(EXIT_SUCCESS); + else if (pid < 0) { + g_error("problems fork'ing for daemon!"); + } + + g_debug("daemonized!"); + } + + if (pidFileParam) { + g_debug("writing pid file"); + fprintf(fp, "%lu\n", (unsigned long)getpid()); + fclose(fp); + } +#else + /* no daemonization on WIN32 */ + (void)options; +#endif +} diff --git a/src/daemon.h b/src/daemon.h new file mode 100644 index 000000000..da83b85a8 --- /dev/null +++ b/src/daemon.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2003-2008 The Music Player Daemon Project + * http://www.musicpd.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef DAEMON_H +#define DAEMON_H + +#include "cmdline.h" + +void +daemonize(Options *options); + +#endif diff --git a/src/main.c b/src/main.c index 7ccbf1a05..c840240a3 100644 --- a/src/main.c +++ b/src/main.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include "daemon.h" #include "client.h" #include "idle.h" #include "command.h" @@ -135,65 +136,6 @@ static void openDB(Options * options, char *argv0) } } -static void daemonize(Options * options) -{ -#ifndef WIN32 - FILE *fp = NULL; - ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0); - - if (pidFileParam) { - /* do this before daemon'izing so we can fail gracefully if we can't - * write to the pid file */ - g_debug("opening pid file"); - fp = fopen(pidFileParam->value, "w+"); - if (!fp) { - g_error("could not open %s \"%s\" (at line %i) for writing: %s", - CONF_PID_FILE, pidFileParam->value, - pidFileParam->line, strerror(errno)); - } - } - - if (options->daemon) { - int pid; - - fflush(NULL); - pid = fork(); - if (pid > 0) - _exit(EXIT_SUCCESS); - else if (pid < 0) { - g_error("problems fork'ing for daemon!"); - } - - if (chdir("/") < 0) { - g_error("problems changing to root directory"); - } - - if (setsid() < 0) { - g_error("problems setsid'ing"); - } - - fflush(NULL); - pid = fork(); - if (pid > 0) - _exit(EXIT_SUCCESS); - else if (pid < 0) { - g_error("problems fork'ing for daemon!"); - } - - g_debug("daemonized!"); - } - - if (pidFileParam) { - g_debug("writing pid file"); - fprintf(fp, "%lu\n", (unsigned long)getpid()); - fclose(fp); - } -#else - /* no daemonization on WIN32 */ - (void)options; -#endif -} - static void cleanUpPidFile(void) { ConfigParam *pidFileParam = parseConfigFilePath(CONF_PID_FILE, 0); |