From 1d348566e6ab446d9c452b1b93aede74368b6618 Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Fri, 6 Jun 2014 15:29:00 -0400 Subject: add SOCK_CLOEXEC fallback for socketpair on old kernels as usual, this is non-atomic, but better than producing an error or failing to set the close-on-exec flag at all. --- src/network/socketpair.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/network/socketpair.c b/src/network/socketpair.c index b15f8467..f3489621 100644 --- a/src/network/socketpair.c +++ b/src/network/socketpair.c @@ -1,7 +1,25 @@ #include +#include +#include #include "syscall.h" int socketpair(int domain, int type, int protocol, int fd[2]) { - return socketcall(socketpair, domain, type, protocol, fd, 0, 0); + int r = socketcall(socketpair, domain, type, protocol, fd, 0, 0); + if (r<0 && (errno==EINVAL || errno==EPROTONOSUPPORT) + && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) { + r = socketcall(socketpair, domain, + type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK), + protocol, fd, 0, 0); + if (r < 0) return r; + if (type & SOCK_CLOEXEC) { + __syscall(SYS_fcntl, fd[0], F_SETFD, FD_CLOEXEC); + __syscall(SYS_fcntl, fd[1], F_SETFD, FD_CLOEXEC); + } + if (type & SOCK_NONBLOCK) { + __syscall(SYS_fcntl, fd[0], F_SETFL, O_NONBLOCK); + __syscall(SYS_fcntl, fd[1], F_SETFL, O_NONBLOCK); + } + } + return r; } -- cgit 1.4.1