alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
Add warnings about invalid output commands
This commit is contained in:
Drew DeVault 2015-11-28 19:24:05 -05:00
parent 01617131f1 c477bbf345
commit 01c5349e1a
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sway/commands.c
View file

@ -767,8 +767,14 @@ static struct cmd_results *cmd_output(int argc, char **argv) {
output->y = y; output->y = y;
} else if (strcasecmp(argv[i], "bg") == 0 || strcasecmp(argv[i], "background") == 0) { } else if (strcasecmp(argv[i], "bg") == 0 || strcasecmp(argv[i], "background") == 0) {
wordexp_t p; wordexp_t p;
char *src = argv[++i]; if (++i >= argc) {
char *mode = argv[++i]; 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) { if (wordexp(src, &p, 0) != 0) {
return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src); return cmd_results_new(CMD_INVALID, "output", "Invalid syntax (%s)", src);
} }