generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am d7a47858: am b37569e3: am f85b9ac3: Merge "Don\'t force O_LARGEFILE on LP64."

Browse Source 
* commit 'd7a478589fdfde8fb4d7d1c9c4c294498f5009b8':
  Don't force O_LARGEFILE on LP64.
This commit is contained in:
Elliott Hughes
2013-12-20 01:57:29 +00:00
committed by Android Git Automerger
parent c77395b341 d7a478589f
commit 8491fd501a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
libc/bionic/open.cpp
View File

@@ -35,52 +35,52 @@
extern "C" int __openat(int, const char*, int, int); extern "C" int __openat(int, const char*, int, int);
static inline int force_O_LARGEFILE(int flags) {
#if __LP64__
return flags; // No need, and aarch64's strace gets confused.
#else
return flags | O_LARGEFILE;
#endif
}
int open(const char* pathname, int flags, ...) { int open(const char* pathname, int flags, ...) {
mode_t mode = 0; mode_t mode = 0;
flags |= O_LARGEFILE; if ((flags & O_CREAT) != 0) {
if (flags & O_CREAT) {
va_list args; va_list args;
va_start(args, flags); va_start(args, flags);
mode = (mode_t) va_arg(args, int); mode = (mode_t) va_arg(args, int);
va_end(args); va_end(args);
} }
return __openat(AT_FDCWD, pathname, flags, mode); return __openat(AT_FDCWD, pathname, force_O_LARGEFILE(flags), mode);
} }
int __open_2(const char* pathname, int flags) { int __open_2(const char* pathname, int flags) {
if (__predict_false(flags & O_CREAT)) { if (__predict_false((flags & O_CREAT) != 0)) {
__fortify_chk_fail("open(O_CREAT): called without specifying a mode", 0); __fortify_chk_fail("open(O_CREAT): called without specifying a mode", 0);
} }
flags |= O_LARGEFILE; return __openat(AT_FDCWD, pathname, force_O_LARGEFILE(flags), 0);
return __openat(AT_FDCWD, pathname, flags, 0);
} }
int openat(int fd, const char *pathname, int flags, ...) { int openat(int fd, const char *pathname, int flags, ...) {
mode_t mode = 0; mode_t mode = 0;
flags |= O_LARGEFILE; if ((flags & O_CREAT) != 0) {
if (flags & O_CREAT) {
va_list args; va_list args;
va_start(args, flags); va_start(args, flags);
mode = (mode_t) va_arg(args, int); mode = (mode_t) va_arg(args, int);
va_end(args); va_end(args);
} }
return __openat(fd, pathname, flags, mode); return __openat(fd, pathname, force_O_LARGEFILE(flags), mode);
} }
int __openat_2(int fd, const char* pathname, int flags) { int __openat_2(int fd, const char* pathname, int flags) {
if (flags & O_CREAT) { if ((flags & O_CREAT) != 0) {
__fortify_chk_fail("openat(O_CREAT): called without specifying a mode", 0); __fortify_chk_fail("openat(O_CREAT): called without specifying a mode", 0);
} }
flags |= O_LARGEFILE; return __openat(fd, pathname, force_O_LARGEFILE(flags), 0);
return __openat(fd, pathname, flags, 0);
} }