/*
- * Copyright (C) 1997-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
#include <sys/types.h> /* getgrnam() */
#include <grp.h>
#include <sys/time.h>
-#include <stdbool.h>
+#include <signal.h>
#include "para.h"
#include "daemon.h"
* \param arg The loglevel/color specifier.
*
* \a arg must be of the form "ll:[fg [bg]] [attr]".
- *
- * \return 1 On success, -1 on errors.
*/
void daemon_set_log_color_or_die(char const *arg)
{
return me->flags & flag;
}
+static void dummy_sighandler(__a_unused int s)
+{
+}
+
/**
* Do the usual stuff to become a daemon.
*
- * Fork, become session leader, dup fd 0, 1, 2 to /dev/null.
+ * \param parent_waits Whether the parent process should pause before exit.
*
- * \sa fork(2), setsid(2), dup(2).
+ * Fork, become session leader, cd to /, and dup fd 0, 1, 2 to /dev/null. If \a
+ * parent_waits is false, the parent process terminates immediately.
+ * Otherwise, it calls pause() to sleep until it receives \p SIGTERM or \p
+ * SIGCHLD and exits successfully thereafter. This behaviour is useful if the
+ * daemon process should not detach from the console until the child process
+ * has completed its setup.
+ *
+ * \sa fork(2), setsid(2), dup(2), pause(2).
*/
-void daemonize(void)
+void daemonize(bool parent_waits)
{
pid_t pid;
int null;
pid = fork();
if (pid < 0)
goto err;
- if (pid)
+ if (pid) {
+ if (parent_waits) {
+ signal(SIGTERM, dummy_sighandler);
+ signal(SIGCHLD, dummy_sighandler);
+ pause();
+ }
exit(EXIT_SUCCESS); /* parent exits */
+ }
/* become session leader */
if (setsid() < 0)
goto err;
* \param ll The log level.
* \param fmt The format string describing the log message.
*/
-__printf_2_3 void para_log(int ll, const char* fmt,...)
+__printf_2_3 void daemon_log(int ll, const char* fmt,...)
{
va_list argp;
FILE *fp;