[04/35] rt: Replace generic stub of shm_unlink with the posix version
Checks
Commit Message
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
Comments
On 03/06/2021 20:15, Florian Weimer via Libc-alpha wrote:
> Result of: git mv -f sysdeps/posix/shm_unlink.c rt
> and manual removal of the _POSIX_MAPPED_FILES preprocessor condition.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> 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 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <errno.h>
> -#include <sys/mman.h>
> +#include <shm-directory.h>
> +#include <string.h>
> +#include <unistd.h>
>
> /* 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
> - <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
>
@@ -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 @@
<https://www.gnu.org/licenses/>. */
#include <errno.h>
-#include <sys/mman.h>
+#include <shm-directory.h>
+#include <string.h>
+#include <unistd.h>
/* 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)
deleted file mode 100644
@@ -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