aboutsummaryrefslogtreecommitdiff
path: root/sway/commands/include.c
diff options
context:
space:
mode:
authorBrian Ashworth <bosrsf04@gmail.com>2018-08-01 23:54:40 -0400
committerBrian Ashworth <bosrsf04@gmail.com>2018-08-03 10:37:35 -0400
commitf9a6407111a8730df51258c3b07502814a8ab3e1 (patch)
tree6cf180159caf4a45a8f37b026b2769d24468a07b /sway/commands/include.c
parent3e2bf7f3a550db995a38808e0abd53fefab96f80 (diff)
Show swaynag on config errors
Diffstat (limited to 'sway/commands/include.c')
-rw-r--r--sway/commands/include.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/sway/commands/include.c b/sway/commands/include.c
index 1ba9a10d..72fec7cc 100644
--- a/sway/commands/include.c
+++ b/sway/commands/include.c
@@ -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);