X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/4c8f6b6a0606a67716435da707057d8fa5f2e12d..f5db09933011a8b4014336a09ece12690d8ba280:/socket.c diff --git a/socket.c b/socket.c index 969b9321..a64aac6c 100644 --- a/socket.c +++ b/socket.c @@ -90,7 +90,7 @@ static int establish_proxy_connection(int fd, char *host, int port, if (*cp == '\r') *cp = '\0'; if (strncmp(buffer, "HTTP/", 5) != 0) { - rprintf(FERROR, "bad response from proxy - %s\n", + rprintf(FERROR, "bad response from proxy -- %s\n", buffer); return -1; } @@ -98,7 +98,7 @@ static int establish_proxy_connection(int fd, char *host, int port, while (*cp == ' ') cp++; if (*cp != '2') { - rprintf(FERROR, "bad response from proxy - %s\n", + rprintf(FERROR, "bad response from proxy -- %s\n", buffer); return -1; } @@ -452,7 +452,7 @@ void start_accept_loop(int port, int (*fn)(int, int)) for (i = 0, maxfd = -1; sp[i] >= 0; i++) { if (listen(sp[i], 5) < 0) { rsyserr(FERROR, errno, "listen() on socket failed"); -#ifdef INET6 +#if INET6 if (errno == EADDRINUSE && i > 0) { rprintf(FINFO, "Try using --ipv4 or --ipv6 to avoid this listen() error.\n"); @@ -522,7 +522,6 @@ void start_accept_loop(int port, int (*fn)(int, int)) close(fd); } } - free(sp); } @@ -617,7 +616,7 @@ void set_socket_options(int fd, char *options) case OPT_ON: if (got_value) - rprintf(FERROR,"syntax error - %s does not take a value\n",tok); + rprintf(FERROR,"syntax error -- %s does not take a value\n",tok); { int on = socket_options[i].value; @@ -649,7 +648,7 @@ void become_daemon(void) } /* detach from the terminal */ -#ifdef HAVE_SETSID +#if HAVE_SETSID setsid(); #else #ifdef TIOCNOTTY