[11/30] Linux: consolidate readlink implementation
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
Use readlink syscall if defined, otherwise readlinkat.
Checked on x86_64-linux-gnu.
---
sysdeps/unix/sysv/linux/{generic => }/readlink.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
rename sysdeps/unix/sysv/linux/{generic => }/readlink.c (80%)
Comments
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use readlink syscall if defined, otherwise readlinkat.
>
> Checked on x86_64-linux-gnu.
LGTM.
No regressions on x86_64 and i686.
Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Tested-by: Carlos O'Donell <carlos@redhat.com>
> ---
> sysdeps/unix/sysv/linux/{generic => }/readlink.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
> rename sysdeps/unix/sysv/linux/{generic => }/readlink.c (80%)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/readlink.c b/sysdeps/unix/sysv/linux/readlink.c
> similarity index 80%
> rename from sysdeps/unix/sysv/linux/generic/readlink.c
> rename to sysdeps/unix/sysv/linux/readlink.c
> index 9f25811a35..083dcaf502 100644
> --- a/sysdeps/unix/sysv/linux/generic/readlink.c
> +++ b/sysdeps/unix/sysv/linux/readlink.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Read value of a symbolic link. Linux version.
> + Copyright (C) 2011-2022 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
> @@ -25,6 +26,10 @@
> ssize_t
> __readlink (const char *path, char *buf, size_t len)
> {
> - return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len);
> +#ifdef __NR_readlink
> + return INLINE_SYSCALL_CALL (readlink, path, buf, len);
> +#else
> + return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len);
> +#endif
OK.
> }
> weak_alias (__readlink, readlink)
similarity index 80%
rename from sysdeps/unix/sysv/linux/generic/readlink.c
rename to sysdeps/unix/sysv/linux/readlink.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Read value of a symbolic link. Linux version.
+ Copyright (C) 2011-2022 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
@@ -25,6 +26,10 @@
ssize_t
__readlink (const char *path, char *buf, size_t len)
{
- return INLINE_SYSCALL (readlinkat, 4, AT_FDCWD, path, buf, len);
+#ifdef __NR_readlink
+ return INLINE_SYSCALL_CALL (readlink, path, buf, len);
+#else
+ return INLINE_SYSCALL_CALL (readlinkat, AT_FDCWD, path, buf, len);
+#endif
}
weak_alias (__readlink, readlink)