cmd: clean up execute_command help message handling
This commit is contained in:
@@ -894,15 +894,17 @@ static int execute_command(struct b_command *cmd, struct b_arglist *args)
|
|||||||
return -1;
|
return -1;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmd->b_flags & B_COMMAND_SHOW_HELP_BY_DEFAULT
|
size_t nr_items = b_arglist_get_count(
|
||||||
&& b_arglist_get_count(args, B_COMMAND_INVALID_ID, B_COMMAND_INVALID_ID)
|
args, B_COMMAND_INVALID_ID, B_COMMAND_INVALID_ID);
|
||||||
== 0) {
|
size_t nr_help = b_arglist_get_count(
|
||||||
|
args, B_COMMAND_OPTION_HELP, B_COMMAND_INVALID_ID);
|
||||||
|
|
||||||
|
if ((cmd->b_flags & B_COMMAND_SHOW_HELP_BY_DEFAULT) && nr_items == 0) {
|
||||||
print_help(cmd);
|
print_help(cmd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (b_arglist_get_count(args, B_COMMAND_OPTION_HELP, B_COMMAND_INVALID_ID)
|
if (nr_help > 0) {
|
||||||
> 0) {
|
|
||||||
print_help(cmd);
|
print_help(cmd);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user