hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-12-23 05:49:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: add wildcard handling in source= (#3276)

Browse source
This commit is contained in:
memchr 2023-09-12 11:54:05 +00:00 committed by GitHub
parent 9192b20b96
commit 5cc53c14d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 47 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
src/config/ConfigManager.cpp
View file

@ -5,6 +5,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include <glob.h>
#include <algorithm> #include <algorithm>
#include <fstream> #include <fstream>
@ -1199,51 +1200,60 @@ void CConfigManager::handleSource(const std::string& command, const std::string&
parseError = "source path " + rawpath + " bogus!"; parseError = "source path " + rawpath + " bogus!";
return; return;
} }
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));
auto value = absolutePath(rawpath, configCurrentPath); if (glob(rawpath.c_str(), GLOB_TILDE, nullptr, glob_buf.get()) != 0) {
Debug::log(ERR, "source= globbing error");
if (!std::filesystem::exists(value)) {
Debug::log(ERR, "source= file doesnt exist");
parseError = "source file " + value + " doesn't exist!";
return; return;
} }
configPaths.push_back(value); for (size_t i = 0; i < glob_buf->gl_pathc; i++) {
auto value = absolutePath(glob_buf->gl_pathv[i], configCurrentPath);
struct stat fileStat; if (!std::filesystem::exists(value)) {
int err = stat(value.c_str(), &fileStat); Debug::log(ERR, "source= file doesnt exist");
if (err != 0) { parseError = "source file " + value + " doesn't exist!";
Debug::log(WARN, "Error at ticking config at {}, error {}: {}", value, err, strerror(err)); return;
return; }
} configPaths.push_back(value);
configModifyTimes[value] = fileStat.st_mtime; struct stat fileStat;
int err = stat(value.c_str(), &fileStat);
std::ifstream ifs; if (err != 0) {
ifs.open(value); Debug::log(WARN, "Error at ticking config at {}, error {}: {}", value, err, strerror(err));
std::string line = ""; return;
int linenum = 1;
if (ifs.is_open()) {
while (std::getline(ifs, line)) {
// Read line by line.
try {
configCurrentPath = value;
parseLine(line);
} catch (...) {
Debug::log(ERR, "Error reading line from config. Line:");
Debug::log(NONE, "{}", line.c_str());
parseError += "Config error at line " + std::to_string(linenum) + " (" + configCurrentPath + "): Line parsing error.";
}
if (parseError != "" && parseError.find("Config error at line") != 0) {
parseError = "Config error at line " + std::to_string(linenum) + " (" + configCurrentPath + "): " + parseError;
}
++linenum;
} }
ifs.close(); configModifyTimes[value] = fileStat.st_mtime;
std::ifstream ifs;
ifs.open(value);
std::string line = "";
int linenum = 1;
if (ifs.is_open()) {
while (std::getline(ifs, line)) {
// Read line by line.
try {
configCurrentPath = value;
parseLine(line);
} catch (...) {
Debug::log(ERR, "Error reading line from config. Line:");
Debug::log(NONE, "{}", line.c_str());
parseError += "Config error at line " + std::to_string(linenum) + " (" + configCurrentPath + "): Line parsing error.";
}
if (parseError != "" && parseError.find("Config error at line") != 0) {
parseError = "Config error at line " + std::to_string(linenum) + " (" + configCurrentPath + "): " + parseError;
}
++linenum;
}
ifs.close();
}
} }
} }