clearlinux/usrbinjava
2
0
Fork 0
mirror of https://github.com/clearlinux/usrbinjava.git synced 2026-09-02 11:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: clearlinux/usrbinjava:v1.0
Branches Tags
clearlinux/usrbinjava:master
clearlinux/usrbinjava:v1.3 clearlinux/usrbinjava:v1.2 clearlinux/usrbinjava:v1.1 clearlinux/usrbinjava:1.1 clearlinux/usrbinjava:v1.0
..
compare: clearlinux/usrbinjava:master
Branches Tags
clearlinux/usrbinjava:master
clearlinux/usrbinjava:v1.3 clearlinux/usrbinjava:v1.2 clearlinux/usrbinjava:v1.1 clearlinux/usrbinjava:1.1 clearlinux/usrbinjava:v1.0
3 Commits
v1.0 .. master
Author SHA1 Message Date
Athenas Jimenez 924d209803 Use basename to get command 
Signed-off-by: Athenas Jimenez <athenas.jimenez.gonzalez@intel.com>
 2019-11-11 17:19:26 +00:00
Athenas Jimenez 90dc1097c5 Keep OpenJDK 8 as default for now 
Signed-off-by: Athenas Jimenez <athenas.jimenez.gonzalez@intel.com>
 2019-11-08 17:06:28 +00:00
Athenas Jimenez c6666a29e5 Secure and minor fixes 
Signed-off-by: Athenas Jimenez <athenas.jimenez.gonzalez@intel.com>
 2019-11-08 00:46:24 +00:00
1 changed files with 12 additions and 12 deletions
Expand all files Collapse all files
src/main.c
+12 -12
View File
@@ -44,35 +44,35 @@ int main(int argc, char **argv)
char java[4096]; char java[4096];
strcpy(java, "/usr/bin/false"); strcpy(java, "/usr/bin/false");
if (getenv("JAVA_HOME")) { if (secure_getenv("JAVA_HOME")) {
strcpy(java, getenv("JAVA_HOME")); strcpy(java, secure_getenv("JAVA_HOME"));
} }
else { else {
if (access("/usr/lib/jvm/java-1.11.0-openjdk", F_OK) == 0) { if (access("/usr/lib/jvm/java-1.8.0-openjdk", F_OK) == 0) {
strcpy(java, "/usr/lib/jvm/java-1.11.0-openjdk"); strcpy(java, "/usr/lib/jvm/java-1.8.0-openjdk");
setenv("JAVA_HOME", "/usr/lib/jvm/java-1.11.0-openjdk", 0); setenv("JAVA_HOME", "/usr/lib/jvm/java-1.8.0-openjdk", 0);
} }
else { else {
if (access("/usr/lib/jvm/java-1.8.0-openjdk", F_OK) == 0) { if (access("/usr/lib/jvm/java-1.11.0-openjdk", F_OK) == 0) {
strcpy(java, "/usr/lib/jvm/java-1.8.0-openjdk"); strcpy(java, "/usr/lib/jvm/java-1.11.0-openjdk");
setenv("JAVA_HOME", "/usr/lib/jvm/java-1.18.0-openjdk", 0); setenv("JAVA_HOME", "/usr/lib/jvm/java-1.11.0-openjdk", 0);
} }
else { else {
if (access("/usr/lib/jvm/java-1.13.0-openjdk", F_OK) == 0) { if (access("/usr/lib/jvm/java-1.13.0-openjdk", F_OK) == 0) {
strcpy(java, "/usr/lib/jvm/java-1.13.0-openjdk"); strcpy(java, "/usr/lib/jvm/java-1.13.0-openjdk");
setenv("JAVA_HOME", "/usr/lib/jvm/java-1.13.0-openjdk", )0); setenv("JAVA_HOME", "/usr/lib/jvm/java-1.13.0-openjdk", 0);
} }
} }
} }
} }
strcat(java, "/bin/"); strcat(java, "/bin/");
strcat(java, argv[0]); strncat(java, basename(argv[0]), 25);
// If cannot access // If cannot access
if (access(java, X_OK)) { if (access(java, X_OK)) {
fprintf(stderr, "Command not available for java version.\n"); fprintf(stderr, "Command not found at %s.\n", java);
fprintf(stderr, "JAVA_HOME=%s\n", getenv("JAVA_HOME")); fprintf(stderr, "JAVA_HOME=%s\n", secure_getenv("JAVA_HOME"));
return EXIT_FAILURE; return EXIT_FAILURE;
} }