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

Fail if unknown output subcommand

Browse source
This commit is contained in:
emersion 2017-12-14 00:50:01 +01:00
parent 4d389f8b65
commit 9254c5a93f
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
sway/commands/output.c
View file

@ -192,7 +192,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
char *src = join_args(argv + i, j); char *src = join_args(argv + i, j);
if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) { if (wordexp(src, &p, 0) != 0 || p.we_wordv[0] == NULL) {
error = cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); error = cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s).", src);
goto fail; goto fail;
} }
free(src); free(src);
@ -213,7 +213,7 @@ struct cmd_results *cmd_output(int argc, char **argv) {
} }
} }
if (!src || access(src, F_OK) == -1) { if (!src || access(src, F_OK) == -1) {
error = cmd_results_new(CMD_INVALID, "output", "Background file unreadable (%s)", src); error = cmd_results_new(CMD_INVALID, "output", "Background file unreadable (%s).", src);
wordfree(&p); wordfree(&p);
goto fail; goto fail;
} }
@ -227,6 +227,9 @@ struct cmd_results *cmd_output(int argc, char **argv) {
i += j; i += j;
} }
} else {
error = cmd_results_new(CMD_INVALID, "output", "Invalid output subcommand: %s.", command);
goto fail;
} }
} }