# HG changeset patch # User sspitsyn # Date 1400317183 25200 # Node ID c673c965975ea439b216bf20d845177a7ead8ac2 # Parent d5e43150cbdc279509e34a16cae0c7d59fb56ab8 8043264: hsdis library not picked up correctly on expected paths Summary: Fix file separator issue on Windows Reviewed-by: sla, sspitsyn Contributed-by: krismo@azulsystems.com diff -r d5e43150cbdc -r c673c965975e src/share/vm/compiler/disassembler.cpp --- a/src/share/vm/compiler/disassembler.cpp Wed Sep 30 12:16:25 2020 +0000 +++ b/src/share/vm/compiler/disassembler.cpp Sat May 17 01:59:43 2014 -0700 @@ -89,7 +89,7 @@ { // Match "jvm[^/]*" in jvm_path. const char* base = buf; - const char* p = strrchr(buf, '/'); + const char* p = strrchr(buf, *os::file_separator()); if (p != NULL) lib_offset = p - base + 1; p = strstr(p ? p : base, "jvm"); if (p != NULL) jvm_offset = p - base; @@ -114,7 +114,7 @@ if (_library == NULL) { // 3. /jre/lib//hsdis-.so buf[lib_offset - 1] = '\0'; - const char* p = strrchr(buf, '/'); + const char* p = strrchr(buf, *os::file_separator()); if (p != NULL) { lib_offset = p - buf + 1; strcpy(&buf[lib_offset], hsdis_library_name);