[1/2] Consolidate Linux access implementation
Commit Message
This patch consolidates the Linux access implementation on
sysdeps/unix/sysv/linux/access.c. Similar to auto-generation through
syscalls.list, __NR_access is check and __NR_faccessat is used only
for newer architectures (where __NR_access is not defined).
Checked on x86_64.
* sysdeps/unix/sysv/linux/access.c: New file.
* sysdeps/unix/sysv/linux/generic/access.c: Remove file.
---
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/access.c | 32 ++++++++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/generic/access.c | 31 -------------------------------
3 files changed, 37 insertions(+), 31 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/access.c
delete mode 100644 sysdeps/unix/sysv/linux/generic/access.c
Comments
On Thursday 10 November 2016 10:34 PM, Adhemerval Zanella wrote:
> This patch consolidates the Linux access implementation on
> sysdeps/unix/sysv/linux/access.c. Similar to auto-generation through
> syscalls.list, __NR_access is check and __NR_faccessat is used only
> for newer architectures (where __NR_access is not defined).
>
> Checked on x86_64.
>
> * sysdeps/unix/sysv/linux/access.c: New file.
> * sysdeps/unix/sysv/linux/generic/access.c: Remove file.
> ---
> ChangeLog | 5 +++++
> sysdeps/unix/sysv/linux/access.c | 32 ++++++++++++++++++++++++++++++++
> sysdeps/unix/sysv/linux/generic/access.c | 31 -------------------------------
> 3 files changed, 37 insertions(+), 31 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/access.c
> delete mode 100644 sysdeps/unix/sysv/linux/generic/access.c
>
> diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c
> new file mode 100644
> index 0000000..cdb7908
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/access.c
> @@ -0,0 +1,32 @@
Top level comment for the file, you could just move the one right before
the function over here. Looks good to me with that change.
> +/* Copyright (C) 2016 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
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <sysdep-cancel.h>
> +
> +/* Test for access to FILE. */
> +int
> +__access (const char *file, int type)
> +{
> +#ifdef __NR_access
> + return INLINE_SYSCALL_CALL (access, file, type);
> +#else
> + return INLINE_SYSCALL_CALL (faccessat, AT_FDCWD, file, type);
> +#endif
> +}
> +weak_alias (__access, access)
> diff --git a/sysdeps/unix/sysv/linux/generic/access.c b/sysdeps/unix/sysv/linux/generic/access.c
> deleted file mode 100644
> index 586aa93..0000000
> --- a/sysdeps/unix/sysv/linux/generic/access.c
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
> -
> - 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
> - <http://www.gnu.org/licenses/>. */
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <unistd.h>
> -#include <fcntl.h>
> -#include <sysdep-cancel.h>
> -
> -/* Test for access to FILE. */
> -int
> -__access (const char *file, int type)
> -{
> - return INLINE_SYSCALL (faccessat, 3, AT_FDCWD, file, type);
> -}
> -weak_alias (__access, access)
>
On 11/10/2016 12:04 PM, Adhemerval Zanella wrote:
> This patch consolidates the Linux access implementation on
> sysdeps/unix/sysv/linux/access.c. Similar to auto-generation through
> syscalls.list, __NR_access is check and __NR_faccessat is used only
> for newer architectures (where __NR_access is not defined).
>
> Checked on x86_64.
OK to checkin if you test this on a second arch, preferably aarch64,
and fix the comment below.
> * sysdeps/unix/sysv/linux/access.c: New file.
> * sysdeps/unix/sysv/linux/generic/access.c: Remove file.
> ---
> ChangeLog | 5 +++++
> sysdeps/unix/sysv/linux/access.c | 32 ++++++++++++++++++++++++++++++++
> sysdeps/unix/sysv/linux/generic/access.c | 31 -------------------------------
> 3 files changed, 37 insertions(+), 31 deletions(-)
> create mode 100644 sysdeps/unix/sysv/linux/access.c
> delete mode 100644 sysdeps/unix/sysv/linux/generic/access.c
>
> diff --git a/sysdeps/unix/sysv/linux/access.c b/sysdeps/unix/sysv/linux/access.c
> new file mode 100644
> index 0000000..cdb7908
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/access.c
> @@ -0,0 +1,32 @@
As Siddhesh notes this needs first line comment.
> +/* Copyright (C) 2016 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
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <fcntl.h>
> +#include <unistd.h>
> +#include <sysdep-cancel.h>
> +
> +/* Test for access to FILE. */
> +int
> +__access (const char *file, int type)
> +{
> +#ifdef __NR_access
> + return INLINE_SYSCALL_CALL (access, file, type);
> +#else
> + return INLINE_SYSCALL_CALL (faccessat, AT_FDCWD, file, type);
> +#endif
> +}
> +weak_alias (__access, access)
> diff --git a/sysdeps/unix/sysv/linux/generic/access.c b/sysdeps/unix/sysv/linux/generic/access.c
> deleted file mode 100644
> index 586aa93..0000000
> --- a/sysdeps/unix/sysv/linux/generic/access.c
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
> -
> - 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
> - <http://www.gnu.org/licenses/>. */
> -
> -#include <errno.h>
> -#include <stddef.h>
> -#include <unistd.h>
> -#include <fcntl.h>
> -#include <sysdep-cancel.h>
> -
> -/* Test for access to FILE. */
> -int
> -__access (const char *file, int type)
> -{
> - return INLINE_SYSCALL (faccessat, 3, AT_FDCWD, file, type);
> -}
> -weak_alias (__access, access)
new file mode 100644
@@ -0,0 +1,32 @@
+/* Copyright (C) 2016 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <fcntl.h>
+#include <unistd.h>
+#include <sysdep-cancel.h>
+
+/* Test for access to FILE. */
+int
+__access (const char *file, int type)
+{
+#ifdef __NR_access
+ return INLINE_SYSCALL_CALL (access, file, type);
+#else
+ return INLINE_SYSCALL_CALL (faccessat, AT_FDCWD, file, type);
+#endif
+}
+weak_alias (__access, access)
deleted file mode 100644
@@ -1,31 +0,0 @@
-/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
-
- 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
- <http://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <stddef.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sysdep-cancel.h>
-
-/* Test for access to FILE. */
-int
-__access (const char *file, int type)
-{
- return INLINE_SYSCALL (faccessat, 3, AT_FDCWD, file, type);
-}
-weak_alias (__access, access)