hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-26 22:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: fix relative path resolution (#3308)

Browse source
This commit is contained in:
memchr 2023-09-14 11:07:31 +00:00 committed by GitHub
parent 0dc8289b02
commit db2b72adee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/config/ConfigManager.cpp
View file

@ -1203,8 +1203,9 @@ void CConfigManager::handleSource(const std::string& command, const std::string&
std::unique_ptr<glob_t, void (*)(glob_t*)> glob_buf{new glob_t, [](glob_t* g) { globfree(g); }}; std::unique_ptr<glob_t, void (*)(glob_t*)> glob_buf{new glob_t, [](glob_t* g) { globfree(g); }};
memset(glob_buf.get(), 0, sizeof(glob_t)); memset(glob_buf.get(), 0, sizeof(glob_t));
if (glob(rawpath.c_str(), GLOB_TILDE, nullptr, glob_buf.get()) != 0) { if (auto r = glob(absolutePath(rawpath, configCurrentPath).c_str(), GLOB_TILDE, nullptr, glob_buf.get()); r != 0) {
Debug::log(ERR, "source= globbing error"); parseError = std::format("source= globbing error: {}", r == GLOB_NOMATCH ? "found no match" : GLOB_ABORTED ? "read error" : "out of memory");
Debug::log(ERR, parseError);
return; return;
} }

24
src/helpers/MiscFunctions.cpp
View file

@ -126,20 +126,22 @@ static const float transforms[][9] = {
std::string absolutePath(const std::string& rawpath, const std::string& currentPath) { std::string absolutePath(const std::string& rawpath, const std::string& currentPath) {
auto value = rawpath; auto value = rawpath;
if (value[0] == '.') {
auto currentDir = currentPath.substr(0, currentPath.find_last_of('/'));
if (value[1] == '.') {
auto parentDir = currentDir.substr(0, currentDir.find_last_of('/'));
value.replace(0, 2 + currentPath.empty(), parentDir);
} else {
value.replace(0, 1 + currentPath.empty(), currentDir);
}
}
if (value[0] == '~') { if (value[0] == '~') {
static const char* const ENVHOME = getenv("HOME"); static const char* const ENVHOME = getenv("HOME");
value.replace(0, 1, std::string(ENVHOME)); value.replace(0, 1, std::string(ENVHOME));
} else if (value[0] != '/') {
auto currentDir = currentPath.substr(0, currentPath.find_last_of('/'));
if (value[0] == '.') {
if (value[1] == '.' && value[2] == '/') {
auto parentDir = currentDir.substr(0, currentDir.find_last_of('/'));
value.replace(0, 2 + currentPath.empty(), parentDir);
} else if (value[1] == '/')
value.replace(0, 1 + currentPath.empty(), currentDir);
else
value = currentDir + '/' + value;
} else
value = currentDir + '/' + value;
} }
return value; return value;