qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rt: Replace generic stub of shm_unlink with the posix version 

Result of: git mv -f sysdeps/posix/shm_unlink.c rt
and manual removal of the _POSIX_MAPPED_FILES preprocessor condition.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-06-21 08:25:15 +02:00
parent b7a0bfbd2f
commit a749a00fb5
2 changed files with 16 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
rt/shm_unlink.c
View File

@ -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. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -16,13 +17,23 @@
<https://www.gnu.org/licenses/>. */ <https://www.gnu.org/licenses/>. */
#include <errno.h> #include <errno.h>
#include <sys/mman.h> #include <shm-directory.h>
#include <string.h>
#include <unistd.h>
/* Remove shared memory object. */ /* Remove shared memory object. */
int int
shm_unlink (const char *name) shm_unlink (const char *name)
{ {
__set_errno (ENOSYS); struct shmdir_name dirname;
return -1; 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)

48
sysdeps/posix/shm_unlink.c
View File

@ -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
<https://www.gnu.org/licenses/>. */
#include <unistd.h>
#if ! _POSIX_MAPPED_FILES
#include <rt/shm_unlink.c>
#else
#include <errno.h>
#include <string.h>
#include <shm-directory.h>
/* 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