External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-12 21:05:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: Add option to suppress error in various functions

Browse Source 
A bool 'report' has been introduced in various functions, which when set
to true will produce the error it is suppposed to produce, and when
false, will suppress the error. These functions are used in the next
patch for auto-completion.

Signed-off-by: Nishith Shah <nishithshah.2211@gmail.com>
This commit is contained in:
Nishith Shah 2016-07-08 18:26:04 +05:30 committed by Michal Privoznik
parent d7079ec98e
commit aceb6308a3
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
tools/vsh.c
View File

@ -434,7 +434,8 @@ static vshCmdOptDef helpopt = {
}; };
static const vshCmdOptDef * static const vshCmdOptDef *
vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name, vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name,
uint64_t *opts_seen, int *opt_index, char **optstr) uint64_t *opts_seen, int *opt_index, char **optstr,
bool report)
{ {
size_t i; size_t i;
const vshCmdOptDef *ret = NULL; const vshCmdOptDef *ret = NULL;
@ -461,8 +462,9 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name,
if ((value = strchr(name, '='))) { if ((value = strchr(name, '='))) {
*value = '\0'; *value = '\0';
if (*optstr) { if (*optstr) {
vshError(ctl, _("invalid '=' after option --%s"), if (report)
opt->name); vshError(ctl, _("invalid '=' after option --%s"),
opt->name);
goto cleanup; goto cleanup;
} }
if (VIR_STRDUP(*optstr, value + 1) < 0) if (VIR_STRDUP(*optstr, value + 1) < 0)
@ -471,7 +473,8 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name,
continue; continue;
} }
if ((*opts_seen & (1ULL << i)) && opt->type != VSH_OT_ARGV) { if ((*opts_seen & (1ULL << i)) && opt->type != VSH_OT_ARGV) {
vshError(ctl, _("option --%s already seen"), name); if (report)
vshError(ctl, _("option --%s already seen"), name);
goto cleanup; goto cleanup;
} }
*opts_seen |= 1ULL << i; *opts_seen |= 1ULL << i;
@ -481,7 +484,7 @@ vshCmddefGetOption(vshControl *ctl, const vshCmdDef *cmd, const char *name,
} }
} }
if (STRNEQ(cmd->name, "help")) { if (STRNEQ(cmd->name, "help") && report) {
vshError(ctl, _("command '%s' doesn't support option --%s"), vshError(ctl, _("command '%s' doesn't support option --%s"),
cmd->name, name); cmd->name, name);
} }
@ -1352,7 +1355,7 @@ typedef enum {
typedef struct _vshCommandParser vshCommandParser; typedef struct _vshCommandParser vshCommandParser;
struct _vshCommandParser { struct _vshCommandParser {
vshCommandToken(*getNextArg)(vshControl *, vshCommandParser *, vshCommandToken(*getNextArg)(vshControl *, vshCommandParser *,
char **); char **, bool);
/* vshCommandStringGetArg() */ /* vshCommandStringGetArg() */
char *pos; char *pos;
/* vshCommandArgvGetArg() */ /* vshCommandArgvGetArg() */
@ -1387,7 +1390,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser)
const vshCmdOptDef *opt = NULL; const vshCmdOptDef *opt = NULL;
tkdata = NULL; tkdata = NULL;
tk = parser->getNextArg(ctl, parser, &tkdata); tk = parser->getNextArg(ctl, parser, &tkdata, true);
if (tk == VSH_TK_ERROR) if (tk == VSH_TK_ERROR)
goto syntaxError; goto syntaxError;
@ -1424,7 +1427,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser)
/* Special case 'help' to ignore all spurious options */ /* Special case 'help' to ignore all spurious options */
if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2, if (!(opt = vshCmddefGetOption(ctl, cmd, tkdata + 2,
&opts_seen, &opt_index, &opts_seen, &opt_index,
&optstr))) { &optstr, true))) {
VIR_FREE(optstr); VIR_FREE(optstr);
if (STREQ(cmd->name, "help")) if (STREQ(cmd->name, "help"))
continue; continue;
@ -1437,7 +1440,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser)
if (optstr) if (optstr)
tkdata = optstr; tkdata = optstr;
else else
tk = parser->getNextArg(ctl, parser, &tkdata); tk = parser->getNextArg(ctl, parser, &tkdata, true);
if (tk == VSH_TK_ERROR) if (tk == VSH_TK_ERROR)
goto syntaxError; goto syntaxError;
if (tk != VSH_TK_ARG) { if (tk != VSH_TK_ARG) {
@ -1559,7 +1562,8 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser)
*/ */
static vshCommandToken ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) static vshCommandToken ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
vshCommandArgvGetArg(vshControl *ctl, vshCommandParser *parser, char **res) vshCommandArgvGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
bool report ATTRIBUTE_UNUSED)
{ {
if (parser->arg_pos == parser->arg_end) { if (parser->arg_pos == parser->arg_end) {
*res = NULL; *res = NULL;
@ -1591,7 +1595,8 @@ vshCommandArgvParse(vshControl *ctl, int nargs, char **argv)
*/ */
static vshCommandToken ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3) static vshCommandToken ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3)
vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res) vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
bool report)
{ {
bool single_quote = false; bool single_quote = false;
bool double_quote = false; bool double_quote = false;
@ -1628,7 +1633,8 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res)
*/ */
p++; p++;
if (*p == '\0') { if (*p == '\0') {
vshError(ctl, "%s", _("dangling \\")); if (report)
vshError(ctl, "%s", _("dangling \\"));
return VSH_TK_ERROR; return VSH_TK_ERROR;
} }
} else if (!single_quote && *p == '"') { /* double quote */ } else if (!single_quote && *p == '"') { /* double quote */
@ -1641,7 +1647,8 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res)
sz++; sz++;
} }
if (double_quote) { if (double_quote) {
vshError(ctl, "%s", _("missing \"")); if (report)
vshError(ctl, "%s", _("missing \""));
return VSH_TK_ERROR; return VSH_TK_ERROR;
} }