happy belated new year

[openldap] / libraries / liblutil / detach.c

diff --git a/libraries/liblutil/detach.c b/libraries/liblutil/detach.c
index 022c2dbd787e825e58a2de47ba124e095ec0233e..742e253a3b12ac1b0d0f562eb5e88650d34d43ba 100644 (file)
--- a/libraries/liblutil/detach.c
+++ b/libraries/liblutil/detach.c
@@ -1,4 +1,18 @@
+/* detach.c -- routines to daemonize a process */
 /* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2010 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
 /*
  * Copyright (c) 1990, 1994 Regents of the University of Michigan.
  * All rights reserved.
@@ -10,6 +24,9 @@
  * software without specific prior written permission. This software
  * is provided ``as is'' without express or implied warranty.
  */
+/* This work was originally developed by the University of Michigan
+ * and distributed as part of U-MICH LDAP.
+ */
 
 #include "portable.h"
 
@@ -39,7 +56,7 @@ lutil_detach( int debug, int do_close )
 
 #ifdef HAVE_SYSCONF
        nbits = sysconf( _SC_OPEN_MAX );
-#elif HAVE_GETDTABLESIZE
+#elif defined(HAVE_GETDTABLESIZE)
        nbits = getdtablesize();
 #else
        nbits = FD_SETSIZE;
@@ -53,7 +70,7 @@ lutil_detach( int debug, int do_close )
 
        if ( debug == 0 ) {
                for ( i = 0; i < 5; i++ ) {
-#if HAVE_THR
+#ifdef HAVE_THR
                        switch ( fork1() )
 #else
                        switch ( fork() )
@@ -72,21 +89,26 @@ lutil_detach( int debug, int do_close )
                        break;
                }
 
-               if ( (sd = open( "/dev/null", O_RDWR )) == -1 ) {
+               if ( (sd = open( "/dev/null", O_RDWR   )) == -1 &&
+                        (sd = open( "/dev/null", O_RDONLY )) == -1 &&
+                        /* Panic -- open *something* */
+                        (sd = open( "/",         O_RDONLY )) == -1    ) {
                        perror("/dev/null");
-               }
+               } else {
+                       /* redirect stdin, stdout, stderr to /dev/null */
+                       dup2( sd, STDIN_FILENO );
+                       dup2( sd, STDOUT_FILENO );
+                       dup2( sd, STDERR_FILENO );
 
-               /* close stdin, stdout, stderr */
-               close( STDIN_FILENO );
-               close( STDOUT_FILENO );
-               close( STDERR_FILENO );
-
-               /* redirect stdin, stdout, stderr to /dev/null */
-               dup2( sd, STDIN_FILENO );
-               dup2( sd, STDOUT_FILENO );
-               dup2( sd, STDERR_FILENO );
-
-               close( sd );
+                       switch( sd ) {
+                       default:
+                               close( sd );
+                       case STDIN_FILENO:
+                       case STDOUT_FILENO:
+                       case STDERR_FILENO:
+                               break;
+                       }
+               }
 
                if ( do_close ) {
                        /* close everything else */