diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-11 15:00:03 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-05-11 15:49:10 -0300 |
| commit | b41152d716ee9c5ba34495a54e64ea2b732139b5 (patch) | |
| tree | d331460ab1b75ffd5ac6accfe8357e8d7c0430a6 /sysdeps/unix/sysv/linux/open64.c | |
| parent | 0f01acb340a0544cb0bc5953e81455c68859946e (diff) | |
| download | glibc-b41152d716ee9c5ba34495a54e64ea2b732139b5.tar.gz glibc-b41152d716ee9c5ba34495a54e64ea2b732139b5.tar.xz glibc-b41152d716ee9c5ba34495a54e64ea2b732139b5.zip | |
Consolidate Linux open implementation
This patch consolidates the open Linux syscall implementation on
sysdeps/unix/sysv/linux/open{64}.c. The changes are:
1. Remove open{64} from auto-generation syscalls.list.
2. Add a new open{64}.c implementation. For architectures that
define __OFF_T_MATCHES_OFF64_T the default open64 will create
alias to required open symbols.
3. Use __NR_openat as default syscall for open{64}.
Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.
* sysdeps/unix/sysv/linux/generic/open.c: Remove file.
* sysdeps/unix/sysv/linux/generic/open64.c: Likewise.
* sysdeps/unix/sysv/linux/wordsize-64/open64.c: Likewise.
* sysdeps/unix/sysv/linux/open.c: New file.
* sysdeps/unix/sysv/linux/open64.c (__libc_open64): Use O_LARGEFILE
only for __OFF_T_MATCHES_OFF64_T and add alias to open if the case.
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list: Remove open
from auto-generated list.
Diffstat (limited to 'sysdeps/unix/sysv/linux/open64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/open64.c | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/open64.c b/sysdeps/unix/sysv/linux/open64.c index 5e209ee917..fcac984d22 100644 --- a/sysdeps/unix/sysv/linux/open64.c +++ b/sysdeps/unix/sysv/linux/open64.c @@ -15,10 +15,11 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ -#include <errno.h> +#include <sys/types.h> +#include <sys/stat.h> #include <fcntl.h> #include <stdarg.h> -#include <stdio.h> + #include <sysdep-cancel.h> /* Open FILE with access OFLAG. If O_CREAT or O_TMPFILE is in OFLAG, @@ -36,8 +37,23 @@ __libc_open64 (const char *file, int oflag, ...) va_end (arg); } - return SYSCALL_CANCEL (open, file, oflag | O_LARGEFILE, mode); +#ifdef __OFF_T_MATCHES_OFF64_T +# define EXTRA_OPEN_FLAGS 0 +#else +# define EXTRA_OPEN_FLAGS O_LARGEFILE +#endif + + return SYSCALL_CANCEL (openat, AT_FDCWD, file, oflag | EXTRA_OPEN_FLAGS, + mode); } -weak_alias (__libc_open64, __open64) + +strong_alias (__libc_open64, __open64) libc_hidden_weak (__open64) weak_alias (__libc_open64, open64) + +#ifdef __OFF_T_MATCHES_OFF64_T +strong_alias (__libc_open64, __libc_open) +strong_alias (__libc_open64, __open) +libc_hidden_weak (__open) +weak_alias (__libc_open64, open) +#endif |