BlockStorage/repertory
1
0
Fork 0
Code Issues 3 Pull Requests Releases 9 Wiki Activity

updated build system

Browse Source
This commit is contained in:
sgraves76
2024-08-02 23:07:48 -05:00
parent 29af6e5b7c
commit 30806c6ebd
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
support/3rd_party/src/utils/path.cpp vendored
View File

@@ -37,6 +37,8 @@ static const std::wstring directory_seperator_str_w{
[[nodiscard]] auto resolve(std::string path) -> std::string { [[nodiscard]] auto resolve(std::string path) -> std::string {
#if defined(_WIN32) #if defined(_WIN32)
if (repertory::utils::string::contains(path, "~") ||
repertory::utils::string::contains(path, "%")) {
repertory::utils::string::replace(path, "~", "%USERPROFILE%"); repertory::utils::string::replace(path, "~", "%USERPROFILE%");
std::string dest; std::string dest;
@@ -44,8 +46,9 @@ static const std::wstring directory_seperator_str_w{
::ExpandEnvironmentStringsA(path.c_str(), dest.data(), ::ExpandEnvironmentStringsA(path.c_str(), dest.data(),
static_cast<DWORD>(dest.size())); static_cast<DWORD>(dest.size()));
path = dest.c_str(); path = dest.c_str();
return path; }
#else // !defined (_WIN32) #else // !defined (_WIN32)
if (repertory::utils::string::contains(path, "~")) {
std::string home{}; std::string home{};
repertory::utils::use_getpwuid(getuid(), [&home](struct passwd *pw) { repertory::utils::use_getpwuid(getuid(), [&home](struct passwd *pw) {
home = (pw->pw_dir ? pw->pw_dir : ""); home = (pw->pw_dir ? pw->pw_dir : "");
@@ -55,7 +58,10 @@ static const std::wstring directory_seperator_str_w{
}); });
return repertory::utils::string::replace(path, "~", home); return repertory::utils::string::replace(path, "~", home);
}
#endif // defined (_WIN32) #endif // defined (_WIN32)
return path;
} }
} // namespace } // namespace