External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-22 04:25:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: add support for accepting arbitrary argv

Browse Source 
* tools/virsh.c (vshCmdOptType): Add VSH_OT_ARGV.  Delete
unused VSH_OT_NONE.
(vshCmddefGetData): Special case new opt flag.
(vshCmddefHelp): Display help for argv.
(vshCommandOptArgv): New function.
This commit is contained in:
Eric Blake 2010-10-15 07:38:49 -06:00
parent fab6d95c43
commit 72e884d577
1 changed files with 59 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
tools/virsh.c
View File

@ -119,11 +119,11 @@ typedef enum {
* vshCmdOptType - command option type * vshCmdOptType - command option type
*/ */
typedef enum { typedef enum {
VSH_OT_NONE = 0, /* none */ VSH_OT_BOOL, /* boolean option */
VSH_OT_BOOL, /* boolean option */ VSH_OT_STRING, /* string option */
VSH_OT_STRING, /* string option */ VSH_OT_INT, /* int option */
VSH_OT_INT, /* int option */ VSH_OT_DATA, /* string data (as non-option) */
VSH_OT_DATA /* string data (as non-option) */ VSH_OT_ARGV /* remaining arguments, opt->name should be "" */
} vshCmdOptType; } vshCmdOptType;
/* /*
@ -230,6 +230,7 @@ static char *vshCommandOptString(const vshCmd *cmd, const char *name,
static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name, static long long vshCommandOptLongLong(const vshCmd *cmd, const char *name,
int *found); int *found);
static int vshCommandOptBool(const vshCmd *cmd, const char *name); static int vshCommandOptBool(const vshCmd *cmd, const char *name);
static char *vshCommandOptArgv(const vshCmd *cmd, int count);
#define VSH_BYID (1 << 1) #define VSH_BYID (1 << 1)
#define VSH_BYUUID (1 << 2) #define VSH_BYUUID (1 << 2)
@ -9707,8 +9708,8 @@ vshCmddefGetData(const vshCmdDef * cmd, int data_ct)
const vshCmdOptDef *opt; const vshCmdOptDef *opt;
for (opt = cmd->opts; opt && opt->name; opt++) { for (opt = cmd->opts; opt && opt->name; opt++) {
if (opt->type == VSH_OT_DATA) { if (opt->type >= VSH_OT_DATA) {
if (data_ct == 0) if (data_ct == 0 || opt->type == VSH_OT_ARGV)
return opt; return opt;
else else
data_ct--; data_ct--;
@ -9784,18 +9785,28 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname)
const vshCmdOptDef *opt; const vshCmdOptDef *opt;
for (opt = def->opts; opt->name; opt++) { for (opt = def->opts; opt->name; opt++) {
const char *fmt; const char *fmt;
if (opt->type == VSH_OT_BOOL) switch (opt->type) {
case VSH_OT_BOOL:
fmt = "[--%s]"; fmt = "[--%s]";
else if (opt->type == VSH_OT_INT) break;
case VSH_OT_INT:
/* xgettext:c-format */ /* xgettext:c-format */
fmt = _("[--%s <number>]"); fmt = _("[--%s <number>]");
else if (opt->type == VSH_OT_STRING) break;
case VSH_OT_STRING:
/* xgettext:c-format */ /* xgettext:c-format */
fmt = _("[--%s <string>]"); fmt = _("[--%s <string>]");
else if (opt->type == VSH_OT_DATA) break;
case VSH_OT_DATA:
fmt = ((opt->flag & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]"); fmt = ((opt->flag & VSH_OFLAG_REQ) ? "<%s>" : "[<%s>]");
else break;
case VSH_OT_ARGV:
/* xgettext:c-format */
fmt = _("[<string>]...");
break;
default:
assert(0); assert(0);
}
fputc(' ', stdout); fputc(' ', stdout);
fprintf(stdout, fmt, opt->name); fprintf(stdout, fmt, opt->name);
} }
@ -9812,15 +9823,26 @@ vshCmddefHelp(vshControl *ctl, const char *cmdname)
const vshCmdOptDef *opt; const vshCmdOptDef *opt;
fputs(_("\n OPTIONS\n"), stdout); fputs(_("\n OPTIONS\n"), stdout);
for (opt = def->opts; opt->name; opt++) { for (opt = def->opts; opt->name; opt++) {
if (opt->type == VSH_OT_BOOL) switch (opt->type) {
case VSH_OT_BOOL:
snprintf(buf, sizeof(buf), "--%s", opt->name); snprintf(buf, sizeof(buf), "--%s", opt->name);
else if (opt->type == VSH_OT_INT) break;
case VSH_OT_INT:
snprintf(buf, sizeof(buf), _("--%s <number>"), opt->name); snprintf(buf, sizeof(buf), _("--%s <number>"), opt->name);
else if (opt->type == VSH_OT_STRING) break;
case VSH_OT_STRING:
snprintf(buf, sizeof(buf), _("--%s <string>"), opt->name); snprintf(buf, sizeof(buf), _("--%s <string>"), opt->name);
else if (opt->type == VSH_OT_DATA) break;
case VSH_OT_DATA:
snprintf(buf, sizeof(buf), _("[--%s] <string>"), snprintf(buf, sizeof(buf), _("[--%s] <string>"),
opt->name); opt->name);
break;
case VSH_OT_ARGV:
/* Not really an option. */
continue;
default:
assert(0);
}
fprintf(stdout, " %-15s %s\n", buf, _(opt->help)); fprintf(stdout, " %-15s %s\n", buf, _(opt->help));
} }
@ -9970,6 +9992,27 @@ vshCommandOptBool(const vshCmd *cmd, const char *name)
return vshCommandOpt(cmd, name) ? TRUE : FALSE; return vshCommandOpt(cmd, name) ? TRUE : FALSE;
} }
/*
* Returns the COUNT argv argument, or NULL after last argument.
*
* Requires that a VSH_OT_ARGV option with the name "" be last in the
* list of supported options in CMD->def->opts.
*/
static char *
vshCommandOptArgv(const vshCmd *cmd, int count)
{
vshCmdOpt *opt = cmd->opts;
while (opt) {
if (opt->def && opt->def->type == VSH_OT_ARGV) {
if (count-- == 0)
return opt->data;
}
opt = opt->next;
}
return NULL;
}
/* Determine whether CMD->opts includes an option with name OPTNAME. /* Determine whether CMD->opts includes an option with name OPTNAME.
If not, give a diagnostic and return false. If not, give a diagnostic and return false.
If so, return true. */ If so, return true. */