sway

commit 01c5349e1a792c40725a23d95c537419ee7cdb1a
parent 01617131f110a3a80987706ff6e86c46f2269255
Author: Drew DeVault <sir@cmpwn.com>
Date:   Sat, 28 Nov 2015 19:24:05 -0500

Merge pull request #272 from mikkeloscar/output-cmd-warnings

Add warnings about invalid output commands
Diffstat:
M
sway/commands.c
 | 
10
++++++++--

1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/sway/commands.c b/sway/commands.c
@@ -767,8 +767,14 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
 			output->y = y;
 		} else if (strcasecmp(argv[i], "bg") == 0 || strcasecmp(argv[i], "background") == 0) {
 			wordexp_t p;
-			char *src = argv[++i];
-			char *mode = argv[++i];
+			if (++i >= argc) {
+				return cmd_results_new(CMD_INVALID, "output", "Missing background file.");
+			}
+			char *src = argv[i];
+			if (++i >= argc) {
+				return cmd_results_new(CMD_INVALID, "output", "Missing background scaling mode.");
+			}
+			char *mode = argv[i];
 			if (wordexp(src, &p, 0) != 0) {
 				return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src);
 			}