X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-fork%2Fustfork.c;h=43b8d8f69a39e3683f59a02d1a4db76b990df3f2;hb=35ac38cb4cc188253c600766882b7a833f5a81ee;hp=cc6963b344419beaec236b24bc0831847e29103d;hpb=3678c8aaf5e2691aaeab0fe15430767138f245d9;p=lttng-ust.git

diff --git a/liblttng-ust-fork/ustfork.c b/liblttng-ust-fork/ustfork.c
index cc6963b3..43b8d8f6 100644
--- a/liblttng-ust-fork/ustfork.c
+++ b/liblttng-ust-fork/ustfork.c
@@ -18,13 +18,13 @@
  */
 
 #define _GNU_SOURCE
-#include <dlfcn.h>
+#include <lttng/ust-dlfcn.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
 #include <sched.h>
 #include <stdarg.h>
-#include "usterr.h"
+#include <errno.h>
 
 #include <lttng/ust.h>
 
@@ -55,6 +55,34 @@ pid_t fork(void)
 	return retval;
 }
 
+int daemon(int nochdir, int noclose)
+{
+	static int (*plibc_func)(int nochdir, int noclose) = NULL;
+	sigset_t sigset;
+	int retval;
+
+	if (plibc_func == NULL) {
+		plibc_func = dlsym(RTLD_NEXT, "daemon");
+		if (plibc_func == NULL) {
+			fprintf(stderr, "libustfork: unable to find \"daemon\" symbol\n");
+			errno = ENOSYS;
+			return -1;
+		}
+	}
+
+	ust_before_fork(&sigset);
+	/* Do the real daemon call */
+	retval = plibc_func(nochdir, noclose);
+	if (retval == 0) {
+		/* child, parent called _exit() directly */
+		ust_after_fork_child(&sigset);
+	} else {
+		/* on error in the parent */
+		ust_after_fork_parent(&sigset);
+	}
+	return retval;
+}
+
 #ifdef __linux__
 
 struct user_desc;
@@ -111,7 +139,7 @@ int clone(int (*fn)(void *), void *child_stack, int flags, void *arg, ...)
 				tls, ctid);
 	} else {
 		/* Creating a real process, we need to intervene. */
-		struct ustfork_clone_info info = { fn = fn, arg = arg };
+		struct ustfork_clone_info info = { .fn = fn, .arg = arg };
 
 		ust_before_fork(&info.sigset);
 		retval = plibc_func(clone_fn, child_stack, flags, &info,