removed old "make dist" target

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index acf7a1b..98093fc 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -81,7 +81,7 @@ static int open_socket_in(int type, int port)
                return -1;
        }
   
-       bzero((char *)&sock,sizeof(sock));
+       memset((char *)&sock,0,sizeof(sock));
        memcpy((char *)&sock.sin_addr,(char *)hp->h_addr, hp->h_length);
        sock.sin_port = htons(port);
        sock.sin_family = hp->h_addrtype;
@@ -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);