From patchwork Thu Jul 19 23:31:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 946652 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-94512-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="aekNmmSn"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Wqzb1CXdz9s4r for ; Fri, 20 Jul 2018 09:31:54 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; q=dns; s= default; b=cSJ5O88wl2rUTLEQ72EwqV5qNEjJnZqIBUTVKgNr3l8biKg3S2roV iDQ/o9VxZJlQmICS3D1QNvkEMGtEsqG1uUYRZ15IkX2V1o+lC3IoTPno0rJMTnqz 0l+Em2jVRkI9oHlarVPYg3Hv8hk0cErJQhRIvl0RrIoBMaCuXQ1dgo= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id; s=default; bh=UgHfGwNl4/IwbKwqlamYN8CUGXE=; b=aekNmmSn+4o68VadAL9wH6WUNNCb QZBq5TpFzi4hzQ9pUN1lNqGqYHT/Mv9DCHspQH2oQ6Sain2Hw3se3LBYy3BmFGdo KArXdK562FcawuUoZyXQjErwofjvNvBE20+86+6kYMPp9LxTFN7zOAOSIJzkk2+G xTu0xXHeHQ/oMqw= Received: (qmail 12103 invoked by alias); 19 Jul 2018 23:31:49 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 12092 invoked by uid 89); 19 Jul 2018 23:31:48 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, UNSUBSCRIBE_BODY autolearn=ham version=3.3.2 spammy=junk, pipes X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Thomas Schwinge Subject: [hurd,commited] hurd: Implement pipe2 Date: Fri, 20 Jul 2018 01:31:42 +0200 Message-Id: <20180719233142.13484-1-samuel.thibault@ens-lyon.org> From: Thomas Schwinge * 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. --- ChangeLog | 3 ++ sysdeps/mach/hurd/pipe.c | 21 +------------- sysdeps/mach/hurd/pipe2.c | 60 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 64 insertions(+), 20 deletions(-) create mode 100644 sysdeps/mach/hurd/pipe2.c diff --git a/ChangeLog b/ChangeLog index 7692a193f2..93cc5f4e0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/sysdeps/mach/hurd/pipe.c b/sysdeps/mach/hurd/pipe.c index 3f4b2026bb..9e67ef7c84 100644 --- a/sysdeps/mach/hurd/pipe.c +++ b/sysdeps/mach/hurd/pipe.c @@ -15,9 +15,6 @@ License along with the GNU C Library; if not, see . */ -#include -#include -#include #include /* 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) diff --git a/sysdeps/mach/hurd/pipe2.c b/sysdeps/mach/hurd/pipe2.c new file mode 100644 index 0000000000..8086d64724 --- /dev/null +++ b/sysdeps/mach/hurd/pipe2.c @@ -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 +#include +#include +#include +#include +#include +#include + +/* 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)