diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-08-01 23:54:40 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-08-03 10:37:35 -0400 |
commit | f9a6407111a8730df51258c3b07502814a8ab3e1 (patch) | |
tree | 6cf180159caf4a45a8f37b026b2769d24468a07b /sway/commands/include.c | |
parent | Merge pull request #2417 from marienz/swaynag-includes (diff) | |
download | sway-f9a6407111a8730df51258c3b07502814a8ab3e1.tar.gz sway-f9a6407111a8730df51258c3b07502814a8ab3e1.tar.zst sway-f9a6407111a8730df51258c3b07502814a8ab3e1.zip |
Show swaynag on config errors
Diffstat (limited to 'sway/commands/include.c')
-rw-r--r-- | sway/commands/include.c | 15 |
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) { | |||
7 | return error; | 7 | return error; |
8 | } | 8 | } |
9 | 9 | ||
10 | if (!load_include_configs(argv[0], config)) { | 10 | char *errors = NULL; |
11 | return cmd_results_new(CMD_INVALID, "include", "Failed to include sub configuration file: %s", argv[0]); | 11 | if (!load_include_configs(argv[0], config, &errors)) { |
12 | struct cmd_results *result = cmd_results_new(CMD_INVALID, "include", | ||
13 | "Failed to include sub configuration file: %s", argv[0]); | ||
14 | free(errors); | ||
15 | return result; | ||
16 | } | ||
17 | |||
18 | if (errors) { | ||
19 | struct cmd_results *result = cmd_results_new(CMD_INVALID, "include", | ||
20 | "There are errors in the included config\n%s", errors); | ||
21 | free(errors); | ||
22 | return result; | ||
12 | } | 23 | } |
13 | 24 | ||
14 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | 25 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); |