LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Update libportable to catch up bionic changes."

Browse Source
This commit is contained in:
Andrew Hsieh
2014-04-24 03:05:21 +00:00
committed by Gerrit Code Review
parent 19dc3c6497 70174f1084
commit 867634ecf4
3 changed files with 15 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
ndk/sources/android/libportable/arch-mips/open.c
View File

@@ -71,83 +71,34 @@ static inline int open_flags_pton(int flags)
} }
extern int __open(const char*, int, int); extern int __openat(int, const char*, int, int);
int WRAP(open)(const char *pathname, int flags, ...) int WRAP(open)(const char *pathname, int flags, ...)
{ {
mode_t mode = 0; mode_t mode = 0;
int native_flags; if ((flags & O_CREAT_PORTABLE) != 0) {
int fd; va_list args;
ALOGV(" ");
ALOGV("%s(pathname:%p, flags:0x%x, ...) {", __func__,
pathname, flags);
flags |= O_LARGEFILE_PORTABLE;
if (flags & O_CREAT_PORTABLE) {
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);
} }
flags |= O_LARGEFILE_PORTABLE;
flags = open_flags_pton(flags);
native_flags = open_flags_pton(flags); return __openat(AT_FDCWD, pathname, flags, mode);
fd = __open(pathname, native_flags, mode);
if (fd == -1) {
/* Can't print pathname as a string, might be bogus */
ALOGV("%s: fd = %d = __open(pathname:%p, native_flags:0x%x, mode:0x%x);", __func__,
fd, pathname, native_flags, mode);
} else {
if (flags & O_CLOEXEC) {
filefd_CLOEXEC_enabled(fd);
} else {
filefd_CLOEXEC_disabled(fd);
}
}
ALOGV("%s: return(fd:%d); }", __func__, fd);
return fd;
} }
extern int __openat(int, const char*, int, int);
int WRAP(openat)(int dirfd, const char *pathname, int flags, ...) int WRAP(openat)(int dirfd, const char *pathname, int flags, ...)
{ {
mode_t mode = 0; mode_t mode = 0;
int native_flags; if ((flags & O_CREAT_PORTABLE) != 0) {
int fd; va_list args;
ALOGV(" ");
ALOGV("%s(dirfd:%d, pathname:0x%p, flags:0x%x, ...) {", __func__,
dirfd, pathname, flags);
flags |= O_LARGEFILE_PORTABLE;
if (flags & O_CREAT_PORTABLE) {
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);
} }
flags |= O_LARGEFILE_PORTABLE;
flags = open_flags_pton(flags);
native_flags = open_flags_pton(flags); return __openat(dirfd, pathname, flags, mode);
fd = __openat(dirfd, pathname, native_flags, mode);
if (fd == -1) {
ALOGV("%s: fd = %d = __open(pathname:0x%p, native_flags:0x%x, mode:0x%d);", __func__,
fd, pathname, native_flags, mode);
} else {
if (flags & O_CLOEXEC) {
filefd_CLOEXEC_enabled(fd);
} else {
filefd_CLOEXEC_disabled(fd);
}
}
ALOGV("%s: return(fd:%d); }", __func__, fd);
return fd;
} }

3
ndk/sources/android/libportable/arch-x86/fenv.c
View File

@@ -141,7 +141,8 @@ WRAP(feclearexcept)(int excepts)
int int
WRAP(fetestexcept)(int excepts) WRAP(fetestexcept)(int excepts)
{ {
return REAL(fetestexcept)(x86_change_except(excepts)); int ret = REAL(fetestexcept)(x86_change_except(excepts));
return x86_get_except(ret);
} }
int int

75
ndk/sources/android/libportable/arch-x86/open.c
View File

@@ -1,75 +0,0 @@
/*
* Copyright 2012, The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <portability.h>
#include <unistd.h>
#include <fcntl.h>
#include <stdarg.h>
#include <fcntl_portable.h>
static inline int x86_change_flags(int flags)
{
int x86flags = flags & O_ACCMODE_PORTABLE;
if (flags & O_CREAT_PORTABLE)
x86flags |= O_CREAT;
if (flags & O_EXCL_PORTABLE)
x86flags |= O_EXCL;
if (flags & O_NOCTTY_PORTABLE)
x86flags |= O_NOCTTY;
if (flags & O_TRUNC_PORTABLE)
x86flags |= O_TRUNC;
if (flags & O_APPEND_PORTABLE)
x86flags |= O_APPEND;
if (flags & O_NONBLOCK_PORTABLE)
x86flags |= O_NONBLOCK;
if (flags & O_SYNC_PORTABLE)
x86flags |= O_SYNC;
if (flags & FASYNC_PORTABLE)
x86flags |= FASYNC;
if (flags & O_DIRECT_PORTABLE)
x86flags |= O_DIRECT;
if (flags & O_LARGEFILE_PORTABLE)
x86flags |= O_LARGEFILE;
if (flags & O_DIRECTORY_PORTABLE)
x86flags |= O_DIRECTORY;
if (flags & O_NOFOLLOW_PORTABLE)
x86flags |= O_NOFOLLOW;
if (flags & O_NOATIME_PORTABLE)
x86flags |= O_NOATIME;
if (flags & O_NDELAY_PORTABLE)
x86flags |= O_NDELAY;
return x86flags;
}
extern int __open(const char*, int, int);
int WRAP(open)(const char *pathname, int flags, ...)
{
mode_t mode = 0;
flags |= O_LARGEFILE;
if (flags & O_CREAT)
{
va_list args;
va_start(args, flags);
mode = (mode_t) va_arg(args, int);
va_end(args);
}
return __open(pathname, x86_change_flags(flags), mode);
}