- close stdout and stderr and reopen then as /dev/null when running as

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 790a86d..f8d4659 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -120,8 +120,6 @@ void start_accept_loop(int port, int (*fn)(int ))
 {
        int s;
 
-       signal(SIGCHLD, SIG_IGN);
-
        /* open an incoming socket */
        s = open_socket_in(SOCK_STREAM, port);
        if (s == -1)
@@ -155,6 +153,15 @@ void start_accept_loop(int port, int (*fn)(int ))
 
                if (fd == -1) continue;
 
+               signal(SIGCHLD, SIG_IGN);
+
+               /* we shouldn't have any children left hanging around
+                  but I have had reports that on Digital Unix zombies
+                  are produced, so this ensures that they are reaped */
+#ifdef WNOHANG
+               waitpid(-1, NULL, WNOHANG);
+#endif
+
                if (fork()==0) {
                        close(s);
 
@@ -274,6 +281,8 @@ become a daemon, discarding the controlling terminal
 ****************************************************************************/
 void become_daemon(void)
 {
+       int i;
+
        if (fork())
                _exit(0);
 
@@ -292,9 +301,12 @@ void become_daemon(void)
        }
 #endif /* TIOCNOTTY */
 #endif
-       close(0);
-       close(1);
-       close(2);
+       /* make sure that stdin, stdout an stderr don't stuff things
+           up (library functions, for example) */
+       for (i=0;i<3;i++) {
+               close(i); 
+               open("/dev/null", O_RDWR);
+       }
 }
 
 /*******************************************************************