comparison src/os/solaris/vm/os_solaris.cpp @ 20204:d22136881b85

Merge
author robm
date Thu, 17 Jul 2014 18:03:26 +0100
parents ce8f6bb717c9 f73af4455d7d
children 7848fc12602b
comparison
equal deleted inserted replaced
20203:4ca77b815015 20204:d22136881b85
1709 // Die immediately, no exit hook, no abort hook, no cleanup. 1709 // Die immediately, no exit hook, no abort hook, no cleanup.
1710 void os::die() { 1710 void os::die() {
1711 ::abort(); // dump core (for debugging) 1711 ::abort(); // dump core (for debugging)
1712 } 1712 }
1713 1713
1714 // unused
1715 void os::set_error_file(const char *logfile) {}
1716
1717 // DLL functions 1714 // DLL functions
1718 1715
1719 const char* os::dll_file_extension() { return ".so"; } 1716 const char* os::dll_file_extension() { return ".so"; }
1720 1717
1721 // This must be hard coded because it's the system's temporary 1718 // This must be hard coded because it's the system's temporary
2355 2352
2356 realpath(java_home_var, buf); 2353 realpath(java_home_var, buf);
2357 // determine if this is a legacy image or modules image 2354 // determine if this is a legacy image or modules image
2358 // modules image doesn't have "jre" subdirectory 2355 // modules image doesn't have "jre" subdirectory
2359 len = strlen(buf); 2356 len = strlen(buf);
2357 assert(len < buflen, "Ran out of buffer space");
2360 jrelib_p = buf + len; 2358 jrelib_p = buf + len;
2361 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch); 2359 snprintf(jrelib_p, buflen-len, "/jre/lib/%s", cpu_arch);
2362 if (0 != access(buf, F_OK)) { 2360 if (0 != access(buf, F_OK)) {
2363 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch); 2361 snprintf(jrelib_p, buflen-len, "/lib/%s", cpu_arch);
2364 } 2362 }
2373 } 2371 }
2374 } 2372 }
2375 } 2373 }
2376 } 2374 }
2377 2375
2378 strcpy(saved_jvm_path, buf); 2376 strncpy(saved_jvm_path, buf, MAXPATHLEN);
2379 } 2377 }
2380 2378
2381 2379
2382 void os::print_jni_name_prefix_on(outputStream* st, int args_size) { 2380 void os::print_jni_name_prefix_on(outputStream* st, int args_size) {
2383 // no prefix required, not even "_" 2381 // no prefix required, not even "_"