diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/openat.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/openat.c | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/sysdeps/unix/sysv/linux/openat.c b/sysdeps/unix/sysv/linux/openat.c index 677712330e..dd7605ffe2 100644 --- a/sysdeps/unix/sysv/linux/openat.c +++ b/sysdeps/unix/sysv/linux/openat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005-2015 Free Software Foundation, Inc. +/* Copyright (C) 2005-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 @@ -30,24 +30,6 @@ # define OPENAT openat #endif - -#define OPENAT_NOT_CANCEL CONCAT (OPENAT) -#define CONCAT(name) CONCAT2 (name) -#define CONCAT2(name) __##name##_nocancel - - -int -OPENAT_NOT_CANCEL (int fd, const char *file, int oflag, mode_t mode) -{ - - /* We have to add the O_LARGEFILE flag for openat64. */ -#ifdef MORE_OFLAGS - oflag |= MORE_OFLAGS; -#endif - - return INLINE_SYSCALL (openat, 4, fd, file, oflag, mode); -} - #define UNDERIZE(name) UNDERIZE_1 (name) #define UNDERIZE_1(name) __##name #define __OPENAT UNDERIZE (OPENAT) @@ -68,6 +50,11 @@ __OPENAT (int fd, const char *file, int oflag, ...) va_end (arg); } + /* We have to add the O_LARGEFILE flag for openat64. */ +#ifdef MORE_OFLAGS + oflag |= MORE_OFLAGS; +#endif + return SYSCALL_CANCEL (openat, fd, file, oflag, mode); } libc_hidden_def (__OPENAT) |