NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

vshCmddefCheckInternals: Improve some checks

Browse Source 
- move the check that completer_flags are 0 if no completer is set
   into a common place and remove duplication
 - add check that _BOOL arguments are not positional
 - add missing checks to _ALIAS

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
This commit is contained in:
Peter Krempa
2024-03-14 10:31:17 +01:00
parent 334510a687
commit 25be987715
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tools/vsh.c
View File

@@ -332,6 +332,13 @@ vshCmddefCheckInternals(vshControl *ctl,
return -1; return -1;
} }
/* Mandate no completer flags if no completer is specified */
if (opt->completer_flags != 0 && !opt->completer) {
vshError(ctl, "completer_flags of argument '%s' of command '%s' must be 0 if no completer is used",
opt->name, cmd->name);
return -1;
}
switch (opt->type) { switch (opt->type) {
case VSH_OT_NONE: case VSH_OT_NONE:
vshError(ctl, "invalid type 'NONE' of option '%s' of command '%s'", vshError(ctl, "invalid type 'NONE' of option '%s' of command '%s'",
@@ -339,12 +346,18 @@ vshCmddefCheckInternals(vshControl *ctl,
return -1; return -1;
case VSH_OT_BOOL: case VSH_OT_BOOL:
if (opt->completer || opt->completer_flags) { if (opt->completer) {
vshError(ctl, "bool parameter '%s' of command '%s' has completer set", vshError(ctl, "bool parameter '%s' of command '%s' has completer set",
opt->name, cmd->name); opt->name, cmd->name);
return -1; return -1;
} }
if (opt->positional) {
vshError(ctl, "boolean parameter '%s' of command '%s' must not be positional",
opt->name, cmd->name);
return -1;
}
if (opt->required) { if (opt->required) {
vshError(ctl, "parameter '%s' of command '%s' misused 'required' flag", vshError(ctl, "parameter '%s' of command '%s' misused 'required' flag",
opt->name, cmd->name); opt->name, cmd->name);
@@ -358,7 +371,11 @@ vshCmddefCheckInternals(vshControl *ctl,
g_autofree char *name = NULL; g_autofree char *name = NULL;
char *p; char *p;
if (opt->flags || !opt->help) { if (opt->required ||
opt->positional ||
opt->completer ||
opt->flags ||
!opt->help) {
vshError(ctl, "parameter '%s' of command '%s' has incorrect alias option", vshError(ctl, "parameter '%s' of command '%s' has incorrect alias option",
opt->name, cmd->name); opt->name, cmd->name);
return -1; return -1;