Miroirs/sway-patched-tray-menu
1
0
Fork 0
mirror of https://github.com/NickHu/sway synced 2024-12-30 22:23:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

commands/bar: improve error for invalid subcommand

Browse source 
Running a command like this produced a confusing error message:

    $ swaymsg bar bar-0 colors background #ff0000
    Error: Unknown/invalid command 'bar-0'

This patch makes the error message use argv[1] instead of argv[0] (from
config_subcommand's implementation), so it actually uses the name of the
command, rather than the id of the bar.
This commit is contained in:
Alyssa Ross 2019-05-17 00:13:41 +00:00 committed by Brian Ashworth
parent 5fb5984e94
commit e4f1ffe601
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
sway/commands/bar.c
View file

@ -80,6 +80,13 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
} }
config->current_bar = bar; config->current_bar = bar;
++argv; --argc; ++argv; --argc;
} else if (!config->reading) {
if (is_subcommand(argv[0])) {
return cmd_results_new(CMD_INVALID, "No bar defined.");
} else {
return cmd_results_new(CMD_INVALID,
"Unknown/invalid command '%s'", argv[1]);
}
} }
if (!config->current_bar) { if (!config->current_bar) {
@ -103,8 +110,6 @@ struct cmd_results *cmd_bar(int argc, char **argv) {
// Set current bar // Set current bar
config->current_bar = bar; config->current_bar = bar;
sway_log(SWAY_DEBUG, "Creating bar %s", bar->id); sway_log(SWAY_DEBUG, "Creating bar %s", bar->id);
} else {
return cmd_results_new(CMD_FAILURE, "No bar defined.");
} }
} }