From patchwork Thu Jul 19 23:22:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 946645 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-94510-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="ckgJesOb"; 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 41WqnM3fSpz9s4r for ; Fri, 20 Jul 2018 09:23:03 +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=ofbYO137o8fn3SjOMgJugfLz4t++yEuOXktxz9x+FpgUM0r2SbTv5 /YalMDV/CfHAk52EMtkO10z540t/u0DZVxejeM5P1CFtSq05ctblanoYVcxQHz6p piNazUtdYLQ4MrGFnyVe3LS6OOLaEzkuu4r11u8x838v2KSCv6t4Lc= 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=5aL+drC4azIkquljMZpVLmsW5o8=; b=ckgJesObM/t6eCQD+DFJwDKfxt/T hB2kpmhs5qygeTG9SZOubasxICh0O5EB3Bc4CblCKqyditPaxy3mUq0MHj3u3Ja6 bYTgGNyUnrq5UsLfqPyGVLG99bRIGKxVKbatarRufoS1uFpWQga/xSB3jqYz3JtN yqjwl2uWZab3sw4= Received: (qmail 130781 invoked by alias); 19 Jul 2018 23:22:57 -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 130766 invoked by uid 89); 19 Jul 2018 23:22:56 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL autolearn=ham version=3.3.2 spammy=protocol X-HELO: hera.aquilenet.fr From: Samuel Thibault To: libc-alpha@sourceware.org Cc: Thomas Schwinge Subject: [hurd,commited] hurd: SOCK_CLOEXEC and SOCK_NONBLOCK for socket Date: Fri, 20 Jul 2018 01:22:51 +0200 Message-Id: <20180719232251.10883-1-samuel.thibault@ens-lyon.org> From: Thomas Schwinge * sysdeps/mach/hurd/socket.c (__socket): Handle SOCK_CLOEXEC and SOCK_NONBLOCK. --- ChangeLog | 5 +++++ sysdeps/mach/hurd/socket.c | 15 ++++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a0cd18db4d..499099006d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,11 @@ * sysdeps/mach/hurd/i386/tls.h (_hurd_tls_init): Set multiple_threads to 1. +2018-07-20 Thomas Schwinge + + * sysdeps/mach/hurd/socket.c (__socket): Handle SOCK_CLOEXEC and + SOCK_NONBLOCK. + 2018-07-19 Leonardo Sandoval * benchtests/scripts/compare_bench.py (__main__): use the argparse diff --git a/sysdeps/mach/hurd/socket.c b/sysdeps/mach/hurd/socket.c index 2c1b98c9e6..43f2c3b2b5 100644 --- a/sysdeps/mach/hurd/socket.c +++ b/sysdeps/mach/hurd/socket.c @@ -21,6 +21,7 @@ #include #include #include +#include /* Create a new socket of type TYPE in domain DOMAIN, using protocol PROTOCOL. If PROTOCOL is zero, one is chosen automatically. @@ -30,6 +31,11 @@ __socket (int domain, int type, int protocol) { error_t err; socket_t sock, server; + int flags = sock_to_o_flags (type & ~SOCK_TYPE_MASK); + type &= SOCK_TYPE_MASK; + + if (flags & ~(O_CLOEXEC | O_NONBLOCK)) + return __hurd_fail (EINVAL); /* Find the socket server for DOMAIN. */ server = _hurd_socket_server (domain, 0); @@ -55,10 +61,17 @@ __socket (int domain, int type, int protocol) || err == MIG_BAD_ID || err == EOPNOTSUPP) err = EAFNOSUPPORT; + if (! err) + { + if (flags & O_NONBLOCK) + err = __io_set_some_openmodes (sock, O_NONBLOCK); + /* TODO: do we need special ERR massaging after the previous call? */ + } + if (err) return __hurd_fail (err); - return _hurd_intern_fd (sock, O_IGNORE_CTTY, 1); + return _hurd_intern_fd (sock, O_IGNORE_CTTY | flags, 1); } libc_hidden_def (__socket)