Last of the cleanup before the patching starts.

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 5843325..140480b 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -48,8 +48,8 @@ static int establish_proxy_connection(int fd, char *host, int port,
        int len;
 
        if (proxy_user && proxy_pass) {
-               snprintf(buffer, sizeof buffer, "%s:%s",
-                        proxy_user, proxy_pass);
+               stringjoin(buffer, sizeof buffer,
+                        proxy_user, ":", proxy_pass, NULL);
                len = strlen(buffer);
 
                if ((len*8 + 5) / 6 >= (int)sizeof authbuf) {
@@ -431,10 +431,10 @@ int is_a_socket(int fd)
 
 static RETSIGTYPE sigchld_handler(UNUSED(int val))
 {
-       signal(SIGCHLD, sigchld_handler);
 #ifdef WNOHANG
        while (waitpid(-1, NULL, WNOHANG) > 0) {}
 #endif
+       signal(SIGCHLD, sigchld_handler);
 }
 
 
@@ -698,7 +698,7 @@ static int socketpair_tcp(int fd[2])
                goto failed;
 
        memset(&sock2, 0, sizeof sock2);
-#ifdef HAVE_SOCKADDR_LEN
+#if HAVE_SOCKADDR_IN_LEN
        sock2.sin_len = sizeof sock2;
 #endif
        sock2.sin_family = PF_INET;