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
Do a better job defining an int32. Also define SIZEOF_INT32
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
8d21735
..
5d3f009
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-452,10
+452,10
@@
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");
for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
if (listen(sp[i], 5) < 0) {
rsyserr(FERROR, errno, "listen() on socket failed");
-#if
def
INET6
+#if INET6
if (errno == EADDRINUSE && i > 0) {
rprintf(FINFO,
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);
@@
-506,9
+506,6
@@
void start_accept_loop(int port, int (*fn)(int, int))
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
int ret;
for (i = 0; sp[i] >= 0; i++)
close(sp[i]);
- /* open log file in child before possibly giving
- * up privileges */
- log_open();
ret = fn(fd, fd);
close_all();
_exit(ret);
ret = fn(fd, fd);
close_all();
_exit(ret);
@@
-652,7
+649,7
@@
void become_daemon(void)
}
/* detach from the terminal */
}
/* detach from the terminal */
-#if
def
HAVE_SETSID
+#if HAVE_SETSID
setsid();
#else
#ifdef TIOCNOTTY
setsid();
#else
#ifdef TIOCNOTTY
@@
-687,7
+684,7
@@
static int socketpair_tcp(int fd[2])
struct sockaddr_in sock;
struct sockaddr_in sock2;
socklen_t socklen = sizeof sock;
struct sockaddr_in sock;
struct sockaddr_in sock2;
socklen_t socklen = sizeof sock;
- int
errno_save,
connect_done = 0;
+ int connect_done = 0;
fd[0] = fd[1] = listener = -1;
fd[0] = fd[1] = listener = -1;
@@
-741,14
+738,12
@@
static int socketpair_tcp(int fd[2])
return 0;
failed:
return 0;
failed:
- errno_save = errno;
if (fd[0] != -1)
close(fd[0]);
if (fd[1] != -1)
close(fd[1]);
if (listener != -1)
close(listener);
if (fd[0] != -1)
close(fd[0]);
if (fd[1] != -1)
close(fd[1]);
if (listener != -1)
close(listener);
- errno = errno_save;
return -1;
}
return -1;
}