diff options
author | Drew DeVault <sir@cmpwn.com> | 2015-08-05 22:59:06 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2015-08-05 22:59:06 -0400 |
commit | 47b28bd335fe279df35f746d5797a1071cb4b989 (patch) | |
tree | b475d79248bb878f0c5060831ca8c3eb486e62fa | |
parent | Make main.c less stupid (diff) | |
download | sway-47b28bd335fe279df35f746d5797a1071cb4b989.tar.gz sway-47b28bd335fe279df35f746d5797a1071cb4b989.tar.zst sway-47b28bd335fe279df35f746d5797a1071cb4b989.zip |
Clean up config loading and launch wayland
-rw-r--r-- | sway/commands.c | 3 | ||||
-rw-r--r-- | sway/config.c | 2 | ||||
-rw-r--r-- | sway/main.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sway/commands.c b/sway/commands.c index a89290a9..4eb733ba 100644 --- a/sway/commands.c +++ b/sway/commands.c | |||
@@ -139,7 +139,8 @@ int handle_command(struct sway_config *config, char *exec) { | |||
139 | } | 139 | } |
140 | struct cmd_handler *handler = find_handler(handlers, sizeof(handlers) / sizeof(struct cmd_handler), cmd); | 140 | struct cmd_handler *handler = find_handler(handlers, sizeof(handlers) / sizeof(struct cmd_handler), cmd); |
141 | if (handler == NULL) { | 141 | if (handler == NULL) { |
142 | return 1; | 142 | fprintf(stderr, "Unknown command '%s'\n", cmd); |
143 | return 0; // TODO: return error, probably | ||
143 | } | 144 | } |
144 | int argc; | 145 | int argc; |
145 | char **argv = split_directive(exec + strlen(handler->command), &argc); | 146 | char **argv = split_directive(exec + strlen(handler->command), &argc); |
diff --git a/sway/config.c b/sway/config.c index e98246ff..b93d3f8c 100644 --- a/sway/config.c +++ b/sway/config.c | |||
@@ -33,7 +33,7 @@ struct sway_config *read_config(FILE *file) { | |||
33 | goto _continue; | 33 | goto _continue; |
34 | } | 34 | } |
35 | 35 | ||
36 | if (!handle_command(config, line)) { | 36 | if (handle_command(config, line) != 0) { |
37 | success = false; | 37 | success = false; |
38 | } | 38 | } |
39 | 39 | ||
diff --git a/sway/main.c b/sway/main.c index 96294e08..9b19a2f0 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -26,7 +26,6 @@ void load_config() { | |||
26 | 26 | ||
27 | int main(int argc, char **argv) { | 27 | int main(int argc, char **argv) { |
28 | load_config(); | 28 | load_config(); |
29 | return 0; | ||
30 | 29 | ||
31 | static struct wlc_interface interface = { }; | 30 | static struct wlc_interface interface = { }; |
32 | if (!wlc_init(&interface, argc, argv)) { | 31 | if (!wlc_init(&interface, argc, argv)) { |