386BSD 0.1 development

[unix-history] / usr / src / lib / libutil / daemon.c

diff --git a/usr/src/lib/libutil/daemon.c b/usr/src/lib/libutil/daemon.c
index 97902a0..f4e663c 100644 (file)
--- a/usr/src/lib/libutil/daemon.c
+++ b/usr/src/lib/libutil/daemon.c
@@ -2,26 +2,42 @@
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted provided
- * that: (1) source distributions retain this entire copyright notice and
- * comment, and (2) distributions including binaries display the following
- * acknowledgement:  ``This product includes software developed by the
- * University of California, Berkeley and its contributors'' in the
- * documentation or other materials provided with the distribution and in
- * all advertising materials mentioning features or use of this software.
- * 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.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)daemon.c   1.2 (Berkeley) 6/29/90";
+static char sccsid[] = "@(#)daemon.c   5.3 (Berkeley) 12/28/90";

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-#include <sys/file.h>
+#include <sys/fcntl.h>
+#include <unistd.h>
+#include <paths.h>

 
 daemon(nochdir, noclose)
        int nochdir, noclose;
 
 daemon(nochdir, noclose)
        int nochdir, noclose;


@@ -36,12 +52,12 @@ daemon(nochdir, noclose)
        if (!nochdir)
                (void) chdir("/");
        if (!noclose) {
        if (!nochdir)
                (void) chdir("/");
        if (!noclose) {

-               int devnull = open("/dev/null", O_RDWR, 0);
+               int devnull = open(_PATH_DEVNULL, O_RDWR, 0);

 
                if (devnull != -1) {
 
                if (devnull != -1) {

-                       (void) dup2(devnull, 0);
-                       (void) dup2(devnull, 1);
-                       (void) dup2(devnull, 2);
+                       (void) dup2(devnull, STDIN_FILENO);
+                       (void) dup2(devnull, STDOUT_FILENO);
+                       (void) dup2(devnull, STDERR_FILENO);

                        if (devnull > 2)
                                (void) close(devnull);
                }
                        if (devnull > 2)
                                (void) close(devnull);
                }