From f0fa84d31fac30ce0f5cba715751478253f4ba8c Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Netto Date: Wed, 19 Oct 2022 19:14:06 -0300 Subject: Linux: consolidate chmod implementation Use chmod syscall if defined, otherwise use fchmodat. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/chmod.c | 34 +++++++++++++++++++++++++++++++++ sysdeps/unix/sysv/linux/generic/chmod.c | 30 ----------------------------- 2 files changed, 34 insertions(+), 30 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/chmod.c delete mode 100644 sysdeps/unix/sysv/linux/generic/chmod.c (limited to 'sysdeps') diff --git a/sysdeps/unix/sysv/linux/chmod.c b/sysdeps/unix/sysv/linux/chmod.c new file mode 100644 index 0000000000..aedd4c0aed --- /dev/null +++ b/sysdeps/unix/sysv/linux/chmod.c @@ -0,0 +1,34 @@ +/* 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 + 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 +#include + +/* Change the protections of FILE to MODE. */ +int +__chmod (const char *file, mode_t 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) +weak_alias (__chmod, chmod) diff --git a/sysdeps/unix/sysv/linux/generic/chmod.c b/sysdeps/unix/sysv/linux/generic/chmod.c deleted file mode 100644 index 98b72c0be1..0000000000 --- a/sysdeps/unix/sysv/linux/generic/chmod.c +++ /dev/null @@ -1,30 +0,0 @@ -/* 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 - 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 -#include -#include - -/* Change the protections of FILE to MODE. */ -int -__chmod (const char *file, mode_t mode) -{ - return INLINE_SYSCALL (fchmodat, 3, AT_FDCWD, file, mode); -} - -libc_hidden_def (__chmod) -weak_alias (__chmod, chmod) -- cgit 1.4.1