External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

vshCommandOpt: Allow caller avoiding assert()

Browse Source 
In the future, completer callbacks will receive partially parsed
command (and thus possibly incomplete). However, we still want
them to use command options fetching APIs we already have (e.g.
vshCommandOpt*()) and at the same time don't report any errors
(nor call any asserts).

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
This commit is contained in:
Michal Privoznik 2017-11-09 18:06:11 +01:00
parent 69ebc64518
commit a26ff63ae4
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tools/vsh.c
View File

@ -815,8 +815,8 @@ vshCommandFree(vshCmd *cmd)
* to the option if found, 0 with *OPT set to NULL if the name is * to the option if found, 0 with *OPT set to NULL if the name is
* valid and the option is not required, -1 with *OPT set to NULL if * valid and the option is not required, -1 with *OPT set to NULL if
* the option is required but not present, and assert if NAME is not * the option is required but not present, and assert if NAME is not
* valid (which indicates a programming error). No error messages are * valid (which indicates a programming error) unless cmd->skipChecks
* issued if a value is returned. * is set. No error messages are issued if a value is returned.
*/ */
static int static int
vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt, vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt,
@ -828,15 +828,19 @@ vshCommandOpt(const vshCmd *cmd, const char *name, vshCmdOpt **opt,
/* See if option is valid and/or required. */ /* See if option is valid and/or required. */
*opt = NULL; *opt = NULL;
while (valid) {
assert(valid->name); if (!cmd->skipChecks) {
if (STREQ(name, valid->name)) while (valid && valid->name) {
break; if (STREQ(name, valid->name))
valid++; break;
valid++;
}
assert(valid && (!needData || valid->type != VSH_OT_BOOL));
if (valid->flags & VSH_OFLAG_REQ)
ret = -1;
} }
assert(!needData || valid->type != VSH_OT_BOOL);
if (valid->flags & VSH_OFLAG_REQ)
ret = -1;
/* See if option is present on command line. */ /* See if option is present on command line. */
while (candidate) { while (candidate) {

3
tools/vsh.h
View File

@ -188,7 +188,8 @@ struct _vshCmdDef {
struct _vshCmd { struct _vshCmd {
const vshCmdDef *def; /* command definition */ const vshCmdDef *def; /* command definition */
vshCmdOpt *opts; /* list of command arguments */ vshCmdOpt *opts; /* list of command arguments */
vshCmd *next; /* next command */ vshCmd *next; /* next command */
bool skipChecks; /* skip validity checks when retrieving opts */
}; };
/* /*