| Index: fusl/src/network/socketpair.c
|
| diff --git a/fusl/src/network/socketpair.c b/fusl/src/network/socketpair.c
|
| index f3489621139a9d2deb5ee3f30eca76ecbec1fe4d..b2dc231e8d2efd1a0f17d0de71262e43fbc2e920 100644
|
| --- a/fusl/src/network/socketpair.c
|
| +++ b/fusl/src/network/socketpair.c
|
| @@ -3,23 +3,22 @@
|
| #include <errno.h>
|
| #include "syscall.h"
|
|
|
| -int socketpair(int domain, int type, int protocol, int fd[2])
|
| -{
|
| - 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;
|
| +int socketpair(int domain, int type, int protocol, int fd[2]) {
|
| + 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;
|
| }
|
|
|