about summary refs log tree commit diff
path: root/sysdeps/unix/sysv
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-11-10 09:24:34 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-11-10 16:38:07 -0200
commit3e06601fedba07d837089daa5c71fe397d6c8389 (patch)
tree929462718cd69b9dfc4ce9e00a947fc8dfc39350 /sysdeps/unix/sysv
parent4589d0715cfa4556388d42f7afbf6aecf7e4aa08 (diff)
downloadglibc-3e06601fedba07d837089daa5c71fe397d6c8389.tar.gz
glibc-3e06601fedba07d837089daa5c71fe397d6c8389.tar.xz
glibc-3e06601fedba07d837089daa5c71fe397d6c8389.zip
Consolidate Linux access implementation
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.
Diffstat (limited to 'sysdeps/unix/sysv')
-rw-r--r--sysdeps/unix/sysv/linux/access.c (renamed from sysdeps/unix/sysv/linux/generic/access.c)15
1 files changed, 8 insertions, 7 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/access.c b/sysdeps/unix/sysv/linux/access.c
index 586aa93757..8f003df27c 100644
--- a/sysdeps/unix/sysv/linux/generic/access.c
+++ b/sysdeps/unix/sysv/linux/access.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011-2016 Free Software Foundation, Inc.
+/* Linux implementation for access function.
+   Copyright (C) 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
@@ -16,16 +16,17 @@
    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 <unistd.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);
+#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)