mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-04-05 11:57:44 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 410dab6803 into ab455bbada

Browse source
This commit is contained in:
LEdoian 2025-03-26 00:36:22 -07:00 • committed by GitHub
commit 53c15afe93
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

24
sway/config.c
View file

@ -552,28 +552,12 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
return success; return success;
} }
static bool load_include_config(const char *path, const char *parent_dir, static bool load_include_config(const char *path, struct sway_config *config,
struct sway_config *config, struct swaynag_instance *swaynag) { struct swaynag_instance *swaynag) {
// save parent config // save parent config
const char *parent_config = config->current_config_path; const char *parent_config = config->current_config_path;
char *full_path; char *real_path = realpath(path, NULL);
int len = strlen(path);
if (len >= 1 && path[0] != '/') {
len = len + strlen(parent_dir) + 2;
full_path = malloc(len * sizeof(char));
if (!full_path) {
sway_log(SWAY_ERROR,
"Unable to allocate full path to included config");
return false;
}
snprintf(full_path, len, "%s/%s", parent_dir, path);
} else {
full_path = strdup(path);
}
char *real_path = realpath(full_path, NULL);
free(full_path);
if (real_path == NULL) { if (real_path == NULL) {
sway_log(SWAY_DEBUG, "%s not found.", path); sway_log(SWAY_DEBUG, "%s not found.", path);
@ -625,7 +609,7 @@ void load_include_configs(const char *path, struct sway_config *config,
char **w = p.we_wordv; char **w = p.we_wordv;
size_t i; size_t i;
for (i = 0; i < p.we_wordc; ++i) { for (i = 0; i < p.we_wordc; ++i) {
load_include_config(w[i], parent_dir, config, swaynag); load_include_config(w[i], config, swaynag);
} }
wordfree(&p); wordfree(&p);
} }