Libc-763.13.tar.gz

[apple/libc.git] / gen / FreeBSD / daemon.c

diff --git a/gen/FreeBSD/daemon.c b/gen/FreeBSD/daemon.c
index 63185d607bdc289335520023f3488ea2e53a3a93..451bcb8d9fa43b91072c16138f3e20fb0285358e 100644 (file)
--- a/gen/FreeBSD/daemon.c
+++ b/gen/FreeBSD/daemon.c
@@ -10,10 +10,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -35,11 +31,14 @@
 static char sccsid[] = "@(#)daemon.c   8.1 (Berkeley) 6/4/93";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.5 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/daemon.c,v 1.8 2007/01/09 00:27:53 imp Exp $");
 
 #include "namespace.h"
+#include <errno.h>
 #include <fcntl.h>
 #include <paths.h>
+#include <stdlib.h>
+#include <signal.h>
 #include <unistd.h>
 #include "un-namespace.h"
 
@@ -47,7 +46,17 @@ int
 daemon(nochdir, noclose)
        int nochdir, noclose;
 {
+       struct sigaction osa, sa;
        int fd;
+       pid_t newgrp;
+       int oerrno;
+       int osa_ok;
+
+       /* A SIGHUP may be thrown when the parent exits below. */
+       sigemptyset(&sa.sa_mask);
+       sa.sa_handler = SIG_IGN;
+       sa.sa_flags = 0;
+       osa_ok = _sigaction(SIGHUP, &sa, &osa);
 
        switch (fork()) {
        case -1:
@@ -58,8 +67,15 @@ daemon(nochdir, noclose)
                _exit(0);
        }
 
-       if (setsid() == -1)
+       newgrp = setsid();
+       oerrno = errno;
+       if (osa_ok != -1)
+               _sigaction(SIGHUP, &osa, NULL);
+
+       if (newgrp == -1) {
+               errno = oerrno;
                return (-1);
+       }
 
        if (!nochdir)
                (void)chdir("/");