From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 404953990431 for ; Thu, 3 Jun 2021 23:15:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 404953990431 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-389-UwNG3djRO6mkmWInDB8tcg-1; Thu, 03 Jun 2021 19:15:09 -0400 X-MC-Unique: UwNG3djRO6mkmWInDB8tcg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 54FBD8018A7 for ; Thu, 3 Jun 2021 23:15:08 +0000 (UTC) Received: from oldenburg.str.redhat.com (ovpn-113-228.ams2.redhat.com [10.36.113.228]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC4BAE468 for ; Thu, 3 Jun 2021 23:15:07 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Subject: [PATCH 04/35] rt: Replace generic stub of shm_unlink with the posix version In-Reply-To: References: X-From-Line: 4b3ec6e7e7ecfb243625e2ab1038f8666567d220 Mon Sep 17 00:00:00 2001 Message-Id: <4b3ec6e7e7ecfb243625e2ab1038f8666567d220.1622761828.git.fweimer@redhat.com> Date: Fri, 04 Jun 2021 01:15:05 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-12.7 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Jun 2021 23:15:12 -0000 Result of: git mv -f sysdeps/posix/shm_unlink.c rt and manual removal of the _POSIX_MAPPED_FILES preprocessor condition. --- rt/shm_unlink.c | 21 +++++++++++++---- sysdeps/posix/shm_unlink.c | 48 -------------------------------------- 2 files changed, 16 insertions(+), 53 deletions(-) delete mode 100644 sysdeps/posix/shm_unlink.c diff --git a/rt/shm_unlink.c b/rt/shm_unlink.c index 27c10d9dee..a5af5ac147 100644 --- a/rt/shm_unlink.c +++ b/rt/shm_unlink.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2000-2021 Free Software Foundation, Inc. +/* shm_unlink -- remove a POSIX shared memory object. Generic POSIX version. + Copyright (C) 2001-2021 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 @@ -16,13 +17,23 @@ . */ #include -#include +#include +#include +#include /* Remove shared memory object. */ int shm_unlink (const char *name) { - __set_errno (ENOSYS); - return -1; + struct shmdir_name dirname; + if (__shm_get_name (&dirname, name, false) != 0) + { + __set_errno (ENOENT); + return -1; + } + + int result = unlink (dirname.name); + if (result < 0 && errno == EPERM) + __set_errno (EACCES); + return result; } -stub_warning (shm_unlink) diff --git a/sysdeps/posix/shm_unlink.c b/sysdeps/posix/shm_unlink.c deleted file mode 100644 index c90b854c78..0000000000 --- a/sysdeps/posix/shm_unlink.c +++ /dev/null @@ -1,48 +0,0 @@ -/* shm_unlink -- remove a POSIX shared memory object. Generic POSIX version. - Copyright (C) 2001-2021 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, see - . */ - -#include - -#if ! _POSIX_MAPPED_FILES -#include - -#else - -#include -#include -#include - - -/* Remove shared memory object. */ -int -shm_unlink (const char *name) -{ - struct shmdir_name dirname; - if (__shm_get_name (&dirname, name, false) != 0) - { - __set_errno (ENOENT); - return -1; - } - - int result = unlink (dirname.name); - if (result < 0 && errno == EPERM) - __set_errno (EACCES); - return result; -} - -#endif -- 2.31.1