diff options
| author | Elliott Hughes <enh@google.com> | 2011-03-16 19:09:22 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2011-03-16 19:09:22 -0700 |
| commit | ddfdbb9d172fe9b72e08e8d7deab0aa3b8acf044 (patch) | |
| tree | 688b8ed404df4a4a00c21d8e165cf88fa674b671 /luni/src/main/native/java_io_File.cpp | |
| parent | ec617e2cb4a374f0fd8fbda4a633214cf23a59a9 (diff) | |
| download | libcore-ddfdbb9d172fe9b72e08e8d7deab0aa3b8acf044.zip libcore-ddfdbb9d172fe9b72e08e8d7deab0aa3b8acf044.tar.gz libcore-ddfdbb9d172fe9b72e08e8d7deab0aa3b8acf044.tar.bz2 | |
Add access(2), strerror(3) and access to environ.
Update java.io.File and java.lang.System to use the new functionality
rather than brewing their own.
Bug: 3107501
Change-Id: I5fa63190d240d638f44a911401143ffb2af9d395
Diffstat (limited to 'luni/src/main/native/java_io_File.cpp')
| -rw-r--r-- | luni/src/main/native/java_io_File.cpp | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/luni/src/main/native/java_io_File.cpp b/luni/src/main/native/java_io_File.cpp index 700f0de..29be412 100644 --- a/luni/src/main/native/java_io_File.cpp +++ b/luni/src/main/native/java_io_File.cpp @@ -20,7 +20,6 @@ #include "JNIHelp.h" #include "JniConstants.h" #include "JniException.h" -#include "LocalArray.h" #include "ScopedFd.h" #include "ScopedLocalRef.h" #include "ScopedPrimitiveArray.h" @@ -87,30 +86,6 @@ static jboolean File_isFileImpl(JNIEnv* env, jclass, jstring javaPath) { return (doStat(env, javaPath, sb) && S_ISREG(sb.st_mode)); } -static jboolean doAccess(JNIEnv* env, jstring javaPath, int mode) { - ScopedUtfChars path(env, javaPath); - if (path.c_str() == NULL) { - return JNI_FALSE; - } - return (access(path.c_str(), mode) == 0); -} - -static jboolean File_existsImpl(JNIEnv* env, jclass, jstring javaPath) { - return doAccess(env, javaPath, F_OK); -} - -static jboolean File_canExecuteImpl(JNIEnv* env, jclass, jstring javaPath) { - return doAccess(env, javaPath, X_OK); -} - -static jboolean File_canReadImpl(JNIEnv* env, jclass, jstring javaPath) { - return doAccess(env, javaPath, R_OK); -} - -static jboolean File_canWriteImpl(JNIEnv* env, jclass, jstring javaPath) { - return doAccess(env, javaPath, W_OK); -} - static jstring File_readlink(JNIEnv* env, jclass, jstring javaPath) { ScopedUtfChars path(env, javaPath); if (path.c_str() == NULL) { @@ -360,12 +335,8 @@ static void File_symlink(JNIEnv* env, jclass, jstring javaOldPath, jstring javaN } static JNINativeMethod gMethods[] = { - NATIVE_METHOD(File, canExecuteImpl, "(Ljava/lang/String;)Z"), - NATIVE_METHOD(File, canReadImpl, "(Ljava/lang/String;)Z"), - NATIVE_METHOD(File, canWriteImpl, "(Ljava/lang/String;)Z"), NATIVE_METHOD(File, createNewFileImpl, "(Ljava/lang/String;)Z"), NATIVE_METHOD(File, deleteImpl, "(Ljava/lang/String;)Z"), - NATIVE_METHOD(File, existsImpl, "(Ljava/lang/String;)Z"), NATIVE_METHOD(File, getFreeSpaceImpl, "(Ljava/lang/String;)J"), NATIVE_METHOD(File, getTotalSpaceImpl, "(Ljava/lang/String;)J"), NATIVE_METHOD(File, getUsableSpaceImpl, "(Ljava/lang/String;)J"), |