[03/30] Linux: consolidate chmod implementation
Checks
Context |
Check |
Description |
dj/TryBot-apply_patch |
success
|
Patch applied to master at the time it was sent
|
Commit Message
Use chmod syscall if defined, otherwise use fchmodat.
Checked on x86_64-linux-gnu.
---
sysdeps/unix/sysv/linux/{generic => }/chmod.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
rename sysdeps/unix/sysv/linux/{generic => }/chmod.c (78%)
Comments
On 10/19/22 18:14, Adhemerval Zanella via Libc-alpha wrote:
> Use chmod syscall if defined, otherwise use fchmodat.
>
> 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 => }/chmod.c | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
> rename sysdeps/unix/sysv/linux/{generic => }/chmod.c (78%)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/chmod.c b/sysdeps/unix/sysv/linux/chmod.c
> similarity index 78%
> rename from sysdeps/unix/sysv/linux/generic/chmod.c
> rename to sysdeps/unix/sysv/linux/chmod.c
> index 98b72c0be1..aedd4c0aed 100644
> --- a/sysdeps/unix/sysv/linux/generic/chmod.c
> +++ b/sysdeps/unix/sysv/linux/chmod.c
> @@ -1,4 +1,5 @@
> -/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
> +/* Change permissions of a file. 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
> @@ -16,14 +17,17 @@
> <https://www.gnu.org/licenses/>. */
>
> #include <fcntl.h>
> -#include <sys/types.h>
> #include <sysdep.h>
>
> /* Change the protections of FILE to MODE. */
> int
> __chmod (const char *file, mode_t mode)
> {
> - return INLINE_SYSCALL (fchmodat, 3, AT_FDCWD, file, mode);
> +#ifdef __NR_chmod
> + return INLINE_SYSCALL_CALL (chmod, file, mode);
> +#else
> + return INLINE_SYSCALL_CALL (fchmodat, AT_FDCWD, file, mode);
> +#endif
OK.
> }
>
> libc_hidden_def (__chmod)
similarity index 78%
rename from sysdeps/unix/sysv/linux/generic/chmod.c
rename to sysdeps/unix/sysv/linux/chmod.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2011-2022 Free Software Foundation, Inc.
+/* Change permissions of a file. 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
@@ -16,14 +17,17 @@
<https://www.gnu.org/licenses/>. */
#include <fcntl.h>
-#include <sys/types.h>
#include <sysdep.h>
/* Change the protections of FILE to MODE. */
int
__chmod (const char *file, mode_t mode)
{
- return INLINE_SYSCALL (fchmodat, 3, AT_FDCWD, file, mode);
+#ifdef __NR_chmod
+ return INLINE_SYSCALL_CALL (chmod, file, mode);
+#else
+ return INLINE_SYSCALL_CALL (fchmodat, AT_FDCWD, file, mode);
+#endif
}
libc_hidden_def (__chmod)