Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Got rid of unused mmap section.
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
29fb2dc
..
be0e311
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-455,7
+455,7
@@
void start_accept_loop(int port, int (*fn)(int, int))
#ifdef INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
#ifdef INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
- "Try using --ipv4 or --ipv6 to avoid this listen() error.");
+ "Try using --ipv4 or --ipv6 to avoid this listen() error.
\n
");
}
#endif
exit_cleanup(RERR_SOCKETIO);
}
#endif
exit_cleanup(RERR_SOCKETIO);
@@
-727,14
+727,16
@@
static int socketpair_tcp(int fd[2])
goto failed;
close(listener);
goto failed;
close(listener);
+ listener = -1;
+
+ set_blocking(fd[1]);
+
if (connect_done == 0) {
if (connect(fd[1], (struct sockaddr *)&sock, sizeof sock) != 0
&& errno != EISCONN)
goto failed;
}
if (connect_done == 0) {
if (connect(fd[1], (struct sockaddr *)&sock, sizeof sock) != 0
&& errno != EISCONN)
goto failed;
}
- set_blocking(fd[1]);
-
/* all OK! */
return 0;
/* all OK! */
return 0;