mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
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.
This commit is contained in:
@ -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
|
||||
|
Reference in New Issue
Block a user