diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-03 15:00:26 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-18 16:30:05 -0300 |
| commit | 0bb2fabcb3bcac064a3d89917c0736353cdac2f4 (patch) | |
| tree | ae8fac95821c7a7953213dee8dea233d5eb5b2cb /sysdeps/unix/sysv/linux/openat64.c | |
| parent | 65a086db91d4e06074b461b8e99efcebe1416a3f (diff) | |
| download | glibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.tar glibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.tar.gz glibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.tar.bz2 glibc-0bb2fabcb3bcac064a3d89917c0736353cdac2f4.zip | |
Consolidate non cancellable openat call
This patch consolidates all the non cancellable openat{64} calls to use
the __openat{64}_nocancel identifier. For non cancellable targets it will
be just a macro to call the default respective symbol while on Linux
will be a internal one.
Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu.
* sysdeps/generic/not-cancel.h (openat_not_cancel): Remove macro.
(openat_not_cancel_3): Likewise.
(openat64_not_cancel_3): Likewise).
(openat_not_cancel_3): Likewise).
* sysdeps/unix/sysv/linux/not-cancel.h (openat_not_cancel): Remove
macro.
(openat_not_cancel_3): Likewise.
(openat64_not_cancel): Likewise.
(openat64_not_cancel_3): Likewise.
* sysdeps/unix/sysv/linux/openat.c (__openat_nocancel): New function.
* sysdeps/unix/sysv/linux/openat64.c (__openat64_nocancel): Likewise.
* io/ftw.c (open_dir_stream): Replace openat{64}_not_cancel{_3} with
__open{64}_nocancel.
* sysdeps/mach/hurd/opendir.c (__opendirat): Likewise.
* sysdeps/posix/getcwd.c (__getcwd): Likewise.
* sysdeps/posix/opendir.c (__opendirat): Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/openat64.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/openat64.c | 36 |
1 files changed, 30 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/openat64.c b/sysdeps/unix/sysv/linux/openat64.c index 4942061671..816e8f17ec 100644 --- a/sysdeps/unix/sysv/linux/openat64.c +++ b/sysdeps/unix/sysv/linux/openat64.c @@ -19,6 +19,13 @@ #include <stdarg.h> #include <sysdep-cancel.h> +#include <not-cancel.h> + +#ifdef __OFF_T_MATCHES_OFF64_T +# define EXTRA_OPEN_FLAGS 0 +#else +# define EXTRA_OPEN_FLAGS O_LARGEFILE +#endif /* Open FILE with access OFLAG. Interpret relative paths relative to the directory associated with FD. If OFLAG includes O_CREAT or @@ -35,12 +42,6 @@ __libc_openat64 (int fd, const char *file, int oflag, ...) va_end (arg); } -#ifdef __OFF_T_MATCHES_OFF64_T -# define EXTRA_OPEN_FLAGS 0 -#else -# define EXTRA_OPEN_FLAGS O_LARGEFILE -#endif - return SYSCALL_CANCEL (openat, fd, file, oflag | EXTRA_OPEN_FLAGS, mode); } @@ -48,8 +49,31 @@ strong_alias (__libc_openat64, __openat64) libc_hidden_weak (__openat64) weak_alias (__libc_openat64, openat64) +#if !IS_IN (rtld) +int +__openat64_nocancel (int fd, const char *file, int oflag, ...) +{ + mode_t mode = 0; + if (__OPEN_NEEDS_MODE (oflag)) + { + va_list arg; + va_start (arg, oflag); + mode = va_arg (arg, mode_t); + va_end (arg); + } + + return INLINE_SYSCALL_CALL (openat, fd, file, oflag | EXTRA_OPEN_FLAGS, + mode); +} +#else +strong_alias (__libc_openat64, __openat64_nocancel) +#endif +libc_hidden_def (__openat64_nocancel) + #ifdef __OFF_T_MATCHES_OFF64_T strong_alias (__libc_openat64, __openat) libc_hidden_weak (__openat) weak_alias (__libc_openat64, openat) + +strong_alias (__openat64_nocancel, __openat_nocancel) #endif |