stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8260335: [macos] Running app using relative path causes problems

Browse Source 
Reviewed-by: almatvee, kizune
This commit is contained in:
Andy Herrick 2021-02-04 14:50:54 +00:00
parent f7a6cff983
commit c1dea39d08
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/jdk.jpackage/share/native/common/FileUtils.cpp
View File

@ -28,7 +28,6 @@
#include "FileUtils.h" #include "FileUtils.h"
namespace FileUtils { namespace FileUtils {
#ifdef _WIN32 #ifdef _WIN32
@ -54,7 +53,15 @@ bool isDirSeparator(const tstring::value_type c) {
tstring dirname(const tstring &path) { tstring dirname(const tstring &path) {
tstring::size_type pos = path.find_last_of(_T("\\/")); tstring::size_type pos;
if (tstrings::endsWith(path, _T("/.")) || tstrings::endsWith(path, _T("\\."))) {
// this method is really getparent dirname - if the path ends with "/.",
// we need to ignore that when looking for the last "/" to find parent
pos = (path.substr(0, path.length() - 2)).find_last_of(_T("\\/"));
} else {
pos = path.find_last_of(_T("\\/"));
}
if (pos != tstring::npos) { if (pos != tstring::npos) {
pos = path.find_last_not_of(_T("\\/"), pos); // skip trailing slashes pos = path.find_last_not_of(_T("\\/"), pos); // skip trailing slashes
} }