mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-11 04:54:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

load_main_config: add realpath to config_chain

Browse Source 
Since `load_include_config` compares against the realpath of a config
file when checking if a config has already been added, the main config's
realpath has to be added to the config_chain.
This commit is contained in:
Brian Ashworth 2019-02-05 22:06:42 -05:00 committed by Drew DeVault
parent 48511c3b35
commit d2d2fc545a
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sway/config.c
View File

@ -379,6 +379,14 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
path = get_config_path(); path = get_config_path();
} }
char *real_path = realpath(path, NULL);
if (real_path == NULL) {
sway_log(SWAY_DEBUG, "%s not found.", path);
free(path);
return false;
}
free(path);
struct sway_config *old_config = config; struct sway_config *old_config = config;
config = calloc(1, sizeof(struct sway_config)); config = calloc(1, sizeof(struct sway_config));
if (!config) { if (!config) {
@ -401,8 +409,8 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
input_manager_reset_all_inputs(); input_manager_reset_all_inputs();
} }
config->current_config_path = path; config->current_config_path = real_path;
list_add(config->config_chain, path); list_add(config->config_chain, real_path);
config->reading = true; config->reading = true;
@ -454,7 +462,7 @@ bool load_main_config(const char *file, bool is_active, bool validating) {
} }
*/ */
success = success && load_config(path, config, success = success && load_config(real_path, config,
&config->swaynag_config_errors); &config->swaynag_config_errors);
if (validating) { if (validating) {