archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8329653: JLILaunchTest fails on AIX after JDK-8329131

Browse source 
Reviewed-by: clanger, mdoerr
This commit is contained in:
Joachim Kern 2024-05-17 08:31:41 +00:00 • committed by Christoph Langer
parent ae999eae7e
commit 14198f502f
3 changed files with 55 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/java.base/unix/native/libjli/java_md_common.c
View file

@ -25,6 +25,8 @@
#include <sys/time.h>
#include "java.h"
#define JAVA_DLL "libjava.so"
/*
* Find the last occurrence of a string
*/
@ -108,6 +110,47 @@ GetApplicationHomeFromDll(char *buf, jint bufsize)
return JNI_FALSE;
}
#if defined(AIX)
static jboolean
LibjavaExists(const char *path)
{
char tmp[PATH_MAX + 1];
struct stat statbuf;
JLI_Snprintf(tmp, PATH_MAX, "%s/%s", path, JAVA_DLL);
if (stat(tmp, &statbuf) == 0) {
return JNI_TRUE;
}
return JNI_FALSE;
}
/*
* Retrieves the path to the JRE home by locating libjava.so in
* LIBPATH and then truncating the path to it.
*/
jboolean
GetApplicationHomeFromLibpath(char *buf, jint bufsize)
{
char *env = getenv("LIBPATH");
char *tmp;
char *save_ptr = NULL;
char *envpath = JLI_StringDup(env);
for (tmp = strtok_r(envpath, ":", &save_ptr); tmp != NULL; tmp = strtok_r(NULL, ":", &save_ptr)) {
if (LibjavaExists(tmp)) {
char *path = realpath(tmp, buf);
if (path == buf) {
JLI_StrCat(buf, "/");
if (JNI_TRUE == TruncatePath(buf, JNI_TRUE)) {
JLI_MemFree(envpath);
return JNI_TRUE;
}
}
}
}
JLI_MemFree(envpath);
return JNI_FALSE;
}
#endif
/*
* Return true if the named program exists
*/