summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2013-03-25 11:34:22 -0400
committerRich Felker <dalias@aerifal.cx>2013-03-25 11:34:22 -0400
commitae7399bfd86c59b8717bb81c70b2acb20acd0f9a (patch)
treef64c28a725c78baf8f835eea1ac465177a5d6c5e
parent9cb6e6ea120cfaf1df9016883012d22fb57d43e1 (diff)
downloadmusl-ae7399bfd86c59b8717bb81c70b2acb20acd0f9a.tar.gz
musl-ae7399bfd86c59b8717bb81c70b2acb20acd0f9a.tar.bz2
musl-ae7399bfd86c59b8717bb81c70b2acb20acd0f9a.tar.xz
musl-ae7399bfd86c59b8717bb81c70b2acb20acd0f9a.zip
in pipe2, use pipe() rather than __syscall(SYS_pipe, ...) for fallback
SYS_pipe is not usable directly in general, since mips has a very broken calling convention for the pipe syscall. instead, just call the function, so that the mips-specific ugliness is isolated in mips/pipe.s and not copied elsewhere.
-rw-r--r--src/unistd/pipe2.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/unistd/pipe2.c b/src/unistd/pipe2.c
index bbeabcbf..f24f74fb 100644
--- a/src/unistd/pipe2.c
+++ b/src/unistd/pipe2.c
@@ -5,11 +5,11 @@
int pipe2(int fd[2], int flag)
{
- if (!flag) return syscall(SYS_pipe, fd);
+ if (!flag) return pipe(fd);
int ret = __syscall(SYS_pipe2, fd, flag);
if (ret != -ENOSYS) return __syscall_ret(ret);
- ret = __syscall(SYS_pipe, fd);
- if (ret) return __syscall_ret(ret);
+ ret = pipe(fd);
+ if (ret) return ret;
if (flag & O_CLOEXEC) {
__syscall(SYS_fcntl, fd[0], F_SETFD, FD_CLOEXEC);
__syscall(SYS_fcntl, fd[1], F_SETFD, FD_CLOEXEC);