--- a/hotspot/src/os/windows/vm/os_windows.cpp Mon Aug 28 23:46:22 2017 +0000
+++ b/hotspot/src/os/windows/vm/os_windows.cpp Thu Aug 17 17:26:02 2017 +0200
@@ -1177,70 +1177,6 @@
}
}
-static bool file_exists(const char* filename) {
- if (filename == NULL || strlen(filename) == 0) {
- return false;
- }
- return GetFileAttributes(filename) != INVALID_FILE_ATTRIBUTES;
-}
-
-bool os::dll_build_name(char *buffer, size_t buflen,
- const char* pname, const char* fname) {
- bool retval = false;
- const size_t pnamelen = pname ? strlen(pname) : 0;
- const char c = (pnamelen > 0) ? pname[pnamelen-1] : 0;
-
- // Return error on buffer overflow.
- if (pnamelen + strlen(fname) + 10 > buflen) {
- return retval;
- }
-
- if (pnamelen == 0) {
- jio_snprintf(buffer, buflen, "%s.dll", fname);
- retval = true;
- } else if (c == ':' || c == '\\') {
- jio_snprintf(buffer, buflen, "%s%s.dll", pname, fname);
- retval = true;
- } else if (strchr(pname, *os::path_separator()) != NULL) {
- int n;
- char** pelements = split_path(pname, &n);
- if (pelements == NULL) {
- return false;
- }
- for (int i = 0; i < n; i++) {
- char* path = pelements[i];
- // Really shouldn't be NULL, but check can't hurt
- size_t plen = (path == NULL) ? 0 : strlen(path);
- if (plen == 0) {
- continue; // skip the empty path values
- }
- const char lastchar = path[plen - 1];
- if (lastchar == ':' || lastchar == '\\') {
- jio_snprintf(buffer, buflen, "%s%s.dll", path, fname);
- } else {
- jio_snprintf(buffer, buflen, "%s\\%s.dll", path, fname);
- }
- if (file_exists(buffer)) {
- retval = true;
- break;
- }
- }
- // release the storage
- for (int i = 0; i < n; i++) {
- if (pelements[i] != NULL) {
- FREE_C_HEAP_ARRAY(char, pelements[i]);
- }
- }
- if (pelements != NULL) {
- FREE_C_HEAP_ARRAY(char*, pelements);
- }
- } else {
- jio_snprintf(buffer, buflen, "%s\\%s.dll", pname, fname);
- retval = true;
- }
- return retval;
-}
-
// Needs to be in os specific directory because windows requires another
// header file <direct.h>
const char* os::get_current_directory(char *buf, size_t buflen) {