For some reason, the original code gets miscompiled on x86_64, leading 'Java_java_io_VMFile_isFile' to return true when the return value of 'cpio_checkType' is ENOENT (= 2). See and . diff --git a/native/jni/java-io/java_io_VMFile.c b/native/jni/java-io/java_io_VMFile.c index de1320b..6695e1f 100644 --- a/native/jni/java-io/java_io_VMFile.c +++ b/native/jni/java-io/java_io_VMFile.c @@ -240,6 +240,7 @@ Java_java_io_VMFile_exists (JNIEnv * env, #ifndef WITHOUT_FILESYSTEM const char *filename; int result; + jboolean exists; /* Don't use the JCL convert function because it throws an exception on failure */ @@ -250,9 +251,10 @@ Java_java_io_VMFile_exists (JNIEnv * env, } result = cpio_isFileExists (filename); + exists = (result == CPNATIVE_OK ? 1 : 0); (*env)->ReleaseStringUTFChars (env, name, filename); - return result == CPNATIVE_OK ? 1 : 0; + return exists; #else /* not WITHOUT_FILESYSTEM */ return 0; #endif /* not WITHOUT_FILESYSTEM */ @@ -278,6 +280,7 @@ Java_java_io_VMFile_isFile (JNIEnv * env, const char *filename; int result; jint entryType; + jboolean isfile; /* Don't use the JCL convert function because it throws an exception on failure */ @@ -288,9 +291,10 @@ Java_java_io_VMFile_isFile (JNIEnv * env, } result = cpio_checkType (filename, &entryType); + isfile = (result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0); (*env)->ReleaseStringUTFChars (env, name, filename); - return result == CPNATIVE_OK && entryType == CPFILE_FILE ? 1 : 0; + return isfile; #else /* not WITHOUT_FILESYSTEM */ return 0; #endif /* not WITHOUT_FILESYSTEM */ @@ -315,6 +319,7 @@ Java_java_io_VMFile_isDirectory (JNIEnv * env, const char *filename; int result; jint entryType; + jboolean isdirectory; /* Don't use the JCL convert function because it throws an exception on failure */ @@ -325,9 +330,10 @@ Java_java_io_VMFile_isDirectory (JNIEnv * env, } result = cpio_checkType (filename, &entryType); + isdirectory = (result == CPNATIVE_OK && entryType == CPFILE_DIRECTORY ? 1 : 0); (*env)->ReleaseStringUTFChars (env, name, filename); - return result == CPNATIVE_OK && entryType == CPFILE_DIRECTORY ? 1 : 0; + return isdirectory; #else /* not WITHOUT_FILESYSTEM */ return 0; #endif /* not WITHOUT_FILESYSTEM */ ist nowrap'>AgeCommit message (Expand)Author 2024-09-12gnu: Add http-kit....* gnu/packages/clojure.scm (http-kit): New variable. Change-Id: Idb920cdab9076615a98e0be716c56b3d65c213a3 Roman Scherer 2024-09-12gnu: Add clojure-core-async....* gnu/packages/clojure.scm (clojure-core-async): New variable. Roman Scherer 2024-09-12gnu: Add clojure-tools-logging....* gnu/packages/clojure.scm (clojure-tools-logging): New variable. Roman Scherer 2024-09-12gnu: Add clojure-tools-analyzer-jvm....* gnu/packages/clojure.scm (clojure-tools-analyzer-jvm): New variable. Roman Scherer 2024-09-12gnu: Add clojure-tools-reader....* gnu/packages/clojure.scm (clojure-tools-reader): New variable. Roman Scherer 2024-09-12gnu: Add clojure-tools-analyzer....* gnu/packages/clojure.scm (clojure-tools-analyzer): New variable. Roman Scherer 2024-09-12gnu: Add clojure-core-memoize....* gnu/packages/clojure.scm (clojure-core-memoize): New variable. Roman Scherer 2024-09-12gnu: Add clojure-core-cache....* gnu/packages/clojure.scm (clojure-core-cache): New variable. Roman Scherer 2024-09-12gnu: Add clojure-data-priority-map....* gnu/packages/clojure.scm (clojure-data-priority-map): New variable. Roman Scherer 2024-09-12gnu: Add clojure-data-json....* gnu/packages/clojure.scm (clojure-data-json): New variable. Change-Id: Id5da429fe375c656842250ed88d84d281954cec9 Roman Scherer