hurd: Implement pipe2

* sysdeps/mach/hurd/pipe2.c: New file, copy from pipe.c.  Evolve it to
	implement __pipe2.
	* sysdeps/mach/hurd/pipe.c (__pipe): Reimplement using __pipe2.
This commit is contained in:
Thomas Schwinge 2018-07-20 01:29:55 +02:00 committed by Samuel Thibault
parent 75d5e4a09e
commit de195be015
3 changed files with 64 additions and 20 deletions

View File

@ -9,6 +9,9 @@
SOCK_NONBLOCK.
* sysdeps/mach/hurd/socketpair.c (__socketpair): Handle SOCK_CLOEXEC
and SOCK_NONBLOCK.
* sysdeps/mach/hurd/pipe2.c: New file, copy from pipe.c. Evolve it to
implement __pipe2.
* sysdeps/mach/hurd/pipe.c (__pipe): Reimplement using __pipe2.
2018-07-19 Leonardo Sandoval <leonardo.sandoval.gonzalez@intel.com>

View File

@ -15,9 +15,6 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <unistd.h>
/* Create a one-way communication channel (pipe).
@ -28,23 +25,7 @@
int
__pipe (int fds[2])
{
int save_errno = errno;
int result;
/* The magic S_IFIFO protocol tells the pflocal server to create
sockets which report themselves as FIFOs, as POSIX requires for
pipes. */
result = __socketpair (PF_LOCAL, SOCK_STREAM, S_IFIFO, fds);
if (result == -1 && errno == EPROTONOSUPPORT)
{
/* We contacted an "old" pflocal server that doesn't support the
magic S_IFIFO protocol.
FIXME: Remove this junk somewhere in the future. */
__set_errno (save_errno);
return __socketpair (PF_LOCAL, SOCK_STREAM, 0, fds);
}
return result;
return __pipe2 (fds, 0);
}
libc_hidden_def (__pipe)
weak_alias (__pipe, pipe)

60
sysdeps/mach/hurd/pipe2.c Normal file
View File

@ -0,0 +1,60 @@
/* Copyright (C) 1992-2015 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <errno.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <unistd.h>
#include <fcntl.h>
#include <fcntl-internal.h>
#include <hurd.h>
/* Create a one-way communication channel (pipe).
Actually the channel is two-way on the Hurd.
If successful, two file descriptors are stored in FDS;
bytes written on FDS[1] can be read from FDS[0].
Apply FLAGS to the new file descriptors.
Returns 0 if successful, -1 if not. */
int
__pipe2 (int fds[2], int flags)
{
int save_errno = errno;
int result;
if (flags & ~(O_CLOEXEC | O_NONBLOCK))
return __hurd_fail (EINVAL);
flags = o_to_sock_flags (flags);
/* The magic S_IFIFO protocol tells the pflocal server to create
sockets which report themselves as FIFOs, as POSIX requires for
pipes. */
result = __socketpair (PF_LOCAL, SOCK_STREAM | flags, S_IFIFO, fds);
if (result == -1 && errno == EPROTONOSUPPORT)
{
/* We contacted an "old" pflocal server that doesn't support the
magic S_IFIFO protocol.
FIXME: Remove this junk somewhere in the future. */
__set_errno (save_errno);
return __socketpair (PF_LOCAL, SOCK_STREAM | flags, 0, fds);
}
return result;
}
weak_alias (__pipe2, pipe2)