mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-09 13:29:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show swaynag on config errors

Browse source
This commit is contained in:
Brian Ashworth 2018-08-01 23:54:40 -04:00
parent 3e2bf7f3a5
commit f9a6407111
6 changed files with 118 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

15
sway/commands/include.c
View file

@ -7,8 +7,19 @@ struct cmd_results *cmd_include(int argc, char **argv) {
return error;
}
if (!load_include_configs(argv[0], config)) {
return cmd_results_new(CMD_INVALID, "include", "Failed to include sub configuration file: %s", argv[0]);
char *errors = NULL;
if (!load_include_configs(argv[0], config, &errors)) {
struct cmd_results *result = cmd_results_new(CMD_INVALID, "include",
"Failed to include sub configuration file: %s", argv[0]);
free(errors);
return result;
}
if (errors) {
struct cmd_results *result = cmd_results_new(CMD_INVALID, "include",
"There are errors in the included config\n%s", errors);
free(errors);
return result;
}
return cmd_results_new(CMD_SUCCESS, NULL, NULL);