mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::string to find the executable's working directory

pull/10979/head
Rubidium 2023-06-09 16:44:42 +02:00 committed by rubidium42
parent 1be668c2e4
commit 81f957b9f8
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/fileio.cpp
View File

@ -738,26 +738,28 @@ extern void DetermineBasePaths(const char *exe);
*/ */
static bool ChangeWorkingDirectoryToExecutable(const char *exe) static bool ChangeWorkingDirectoryToExecutable(const char *exe)
{ {
char tmp[MAX_PATH]; std::string path = exe;
strecpy(tmp, exe, lastof(tmp));
bool success = false;
#ifdef WITH_COCOA #ifdef WITH_COCOA
char *app_bundle = strchr(tmp, '.'); for (size_t pos = path.find_first_of('.'); pos != std::string::npos; pos = path.find_first_of('.', pos + 1)) {
while (app_bundle != nullptr && !StrStartsWithIgnoreCase(app_bundle, ".app")) app_bundle = strchr(&app_bundle[1], '.'); if (StrEqualsIgnoreCase(path.substr(pos, 4), ".app")) {
path.erase(pos);
if (app_bundle != nullptr) *app_bundle = '\0'; break;
#endif /* WITH_COCOA */
char *s = strrchr(tmp, PATHSEPCHAR);
if (s != nullptr) {
*s = '\0';
if (chdir(tmp) != 0) {
Debug(misc, 0, "Directory with the binary does not exist?");
} else {
success = true;
} }
} }
return success; #endif /* WITH_COCOA */
size_t pos = path.find_last_of(PATHSEPCHAR);
if (pos == std::string::npos) return false;
path.erase(pos);
if (chdir(path.c_str()) != 0) {
Debug(misc, 0, "Directory with the binary does not exist?");
return false;
}
return true;
} }
/** /**