Muldersoft/Launch5j
Muldersoft/Launch5j
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Skip leading path separators in the relative JRE path.

Browse Source
This commit is contained in:
LoRd_MuldeR 2020-09-29 22:45:41 +02:00
parent 5dcdfa7195
commit d32bd86a6b
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/head.c
View File

@ -233,7 +233,7 @@ static wchar_t *get_path_without_suffix(const wchar_t *const path)
static wchar_t * trim_trailing_separator(wchar_t *const path) static wchar_t * trim_trailing_separator(wchar_t *const path)
{ {
if(NOT_EMPTY(path)) if (NOT_EMPTY(path))
{ {
size_t len = wcslen(path); size_t len = wcslen(path);
while ((len > 0U) && ((path[len-1U] == L'\\') || (path[len-1U] == L'/'))) while ((len > 0U) && ((path[len-1U] == L'\\') || (path[len-1U] == L'/')))
@ -244,6 +244,15 @@ static wchar_t * trim_trailing_separator(wchar_t *const path)
return path; return path;
} }
static const wchar_t *skip_leading_separator(const wchar_t *path)
{
if (NOT_EMPTY(path))
{
for (; (*path) && ((*path == L'\\') || (*path == L'/')); ++path);
}
return path;
}
static BOOL file_exists(const wchar_t *const filename) { static BOOL file_exists(const wchar_t *const filename) {
struct _stat buffer; struct _stat buffer;
if (_wstat(filename, &buffer) == 0) if (_wstat(filename, &buffer) == 0)
@ -1104,7 +1113,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR pCmdLine
} }
#else #else
jre_relative_path = load_string(hInstance, ID_STR_JREPATH); jre_relative_path = load_string(hInstance, ID_STR_JREPATH);
if (!(java_runtime_path = awprintf(L"%ls\\%ls", executable_directory, AVAILABLE(jre_relative_path) ? jre_relative_path: JRE_RELATIVE_PATH_DEFAULT))) if (!(java_runtime_path = awprintf(L"%ls\\%ls", executable_directory, AVAILABLE(jre_relative_path) ? skip_leading_separator(jre_relative_path) : JRE_RELATIVE_PATH_DEFAULT)))
{ {
show_message(hwnd, MB_ICONERROR | MB_TOPMOST, APP_HEADING, L"The path of the Java runtime could not be determined!"); show_message(hwnd, MB_ICONERROR | MB_TOPMOST, APP_HEADING, L"The path of the Java runtime could not be determined!");
goto cleanup; goto cleanup;