External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-04 16:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

virsh: support single quote

Browse Source 
Some users may type command like this at the virsh shell:
virsh # somecmd 'some arg'

because they often use single quote in linux shell.

Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
This commit is contained in:
Lai Jiangshan 2010-10-12 15:14:17 +08:00 committed by Eric Blake
parent 5232101487
commit 57868d121b
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/virsh.c
View File

@ -10384,6 +10384,7 @@ static int 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 single_quote = false;
bool double_quote = false; bool double_quote = false;
int sz = 0; int sz = 0;
char *p = parser->pos; char *p = parser->pos;
@ -10403,16 +10404,25 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res)
while (*p) { while (*p) {
/* end of token is blank space or ';' */ /* end of token is blank space or ';' */
if (!double_quote && (*p == ' ' || *p == '\t' || *p == ';')) if (!double_quote && !single_quote &&
(*p == ' ' || *p == '\t' || *p == ';'))
break; break;
if (*p == '\\') { /* escape */ if (!double_quote && *p == '\'') { /* single quote */
single_quote = !single_quote;
p++;
continue;
} else if (!single_quote && *p == '\\') { /* escape */
/*
* The same as the bash, a \ in "" is an escaper,
* but a \ in '' is not an escaper.
*/
p++; p++;
if (*p == '\0') { if (*p == '\0') {
vshError(ctl, "%s", _("dangling \\")); vshError(ctl, "%s", _("dangling \\"));
return VSH_TK_ERROR; return VSH_TK_ERROR;
} }
} else if (*p == '"') { /* double quote */ } else if (!single_quote && *p == '"') { /* double quote */
double_quote = !double_quote; double_quote = !double_quote;
p++; p++;
continue; continue;