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
fixed a bug in the glob expansion code (pointed out by
[rsync/rsync.git]
/
socket.c
diff --git
a/socket.c
b/socket.c
index
27260a1
..
910c2dc
100644
(file)
--- a/
socket.c
+++ b/
socket.c
@@
-125,12
+125,12
@@
void start_accept_loop(int port, int (*fn)(int ))
/* open an incoming socket */
s = open_socket_in(SOCK_STREAM, port);
if (s == -1)
/* open an incoming socket */
s = open_socket_in(SOCK_STREAM, port);
if (s == -1)
- exit(1);
+ exit
_cleanup
(1);
/* ready to listen */
if (listen(s, 5) == -1) {
close(s);
/* ready to listen */
if (listen(s, 5) == -1) {
close(s);
- exit(1);
+ exit
_cleanup
(1);
}
}
@@
-216,6
+216,8
@@
set user socket options
void set_socket_options(int fd, char *options)
{
char *tok;
void set_socket_options(int fd, char *options)
{
char *tok;
+ if (!options || !*options) return;
+
options = strdup(options);
if (!options) out_of_memory("set_socket_options");
options = strdup(options);
if (!options) out_of_memory("set_socket_options");
@@
-306,7
+308,7
@@
char *client_addr(int fd)
static char addr_buf[100];
if (getpeername(fd, &sa, &length)) {
static char addr_buf[100];
if (getpeername(fd, &sa, &length)) {
- exit(1);
+ exit
_cleanup
(1);
}
strlcpy(addr_buf,(char *)inet_ntoa(sockin->sin_addr), sizeof(addr_buf)-1);
}
strlcpy(addr_buf,(char *)inet_ntoa(sockin->sin_addr), sizeof(addr_buf)-1);
@@
-329,7
+331,7
@@
char *client_name(int fd)
strcpy(name_buf,"UNKNOWN");
if (getpeername(fd, &sa, &length)) {
strcpy(name_buf,"UNKNOWN");
if (getpeername(fd, &sa, &length)) {
- exit(1);
+ exit
_cleanup
(1);
}
/* Look up the remote host name. */
}
/* Look up the remote host name. */