aboutsummaryrefslogtreecommitdiff
path: root/lib/net.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2017-01-04 01:32:44 -0600
committerRob Landley <rob@landley.net>2017-01-04 01:32:44 -0600
commita1a559e25a19726b3a62267feb5e89bad2fcd01e (patch)
tree7f6942e4a2801e41a027f4ba5db40a47e05a7eab /lib/net.c
parent4d4ca28acaa44069893d06aea64e304809527b16 (diff)
downloadtoybox-a1a559e25a19726b3a62267feb5e89bad2fcd01e.tar.gz
Some lib fixes: mark xvfork() noinline, make xsendfile() return bytes copied,
make xsocket()'s returned fd CLOEXEC.
Diffstat (limited to 'lib/net.c')
-rw-r--r--lib/net.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/net.c b/lib/net.c
index 1a46a5a9..df2551f7 100644
--- a/lib/net.c
+++ b/lib/net.c
@@ -5,6 +5,8 @@ int xsocket(int domain, int type, int protocol)
int fd = socket(domain, type, protocol);
if (fd < 0) perror_exit("socket %x %x", type, protocol);
+ fcntl(fd, F_SETFD, FD_CLOEXEC);
+
return fd;
}
@@ -35,7 +37,7 @@ int xconnect(char *host, char *port, int family, int socktype, int protocol,
fd = (ai->ai_next ? socket : xsocket)(ai->ai_family, ai->ai_socktype,
ai->ai_protocol);
if (!connect(fd, ai->ai_addr, ai->ai_addrlen)) break;
- else if (!ai2->ai_next) perror_exit("connect");
+ else if (!ai->ai_next) perror_exit("connect");
close(fd);
}
freeaddrinfo(ai2);