hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve quoting mechanism is debug interface

Browse Source 
Introduce the use of \ and allow the quotes to appear at any point
within the string, not just the beginning and end of words.
This commit is contained in:
Mark Riddoch
2014-05-22 15:24:07 +01:00
parent 837d15dc33
commit 3b984d2773
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
server/modules/routing/debugcmd.c
View File

@ -415,18 +415,34 @@ int argc, i, j, found = 0;
char *args[MAXARGS]; char *args[MAXARGS];
char *saveptr, *delim = " \t\r\n"; char *saveptr, *delim = " \t\r\n";
unsigned long arg1, arg2, arg3; unsigned long arg1, arg2, arg3;
int in_quotes = 0; int in_quotes = 0, escape_next = 0;
char *ptr; char *ptr, *lptr;
args[0] = cli->cmdbuf; args[0] = cli->cmdbuf;
ptr = args[0]; ptr = args[0];
in_quotes = 0; lptr = ptr;
i = 0; i = 0;
/*
* Break the command line into a number of words. Whitespace is used
* to delimit words and may be escaped by use of the \ character or
* the use of double quotes.
* The array args contains the broken down words, one per index.
*/
while (*ptr) while (*ptr)
{ {
if (in_quotes == 0 && (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n')) if (escape_next)
{ {
*ptr = 0; *lptr++ = *ptr++;
escape_next = 0;
}
else if (*ptr == '\\')
{
escape_next = 1;
ptr++;
}
else if (in_quotes == 0 && (*ptr == ' ' || *ptr == '\t' || *ptr == '\r' || *ptr == '\n'))
{
*lptr = 0;
if (args[i] == ptr) if (args[i] == ptr)
args[i] = ptr + 1; args[i] = ptr + 1;
else else
@ -436,19 +452,25 @@ char *ptr;
break; break;
args[i] = ptr + 1; args[i] = ptr + 1;
} }
ptr++;
lptr++;
} }
else if (*ptr == '\"' && in_quotes == 0 && args[i] == ptr) else if (*ptr == '\"' && in_quotes == 0)
{ {
args[i]++;
in_quotes = 1; in_quotes = 1;
ptr++;
} }
else if (*ptr == '\"' && in_quotes == 1) else if (*ptr == '\"' && in_quotes == 1)
{ {
*ptr = 0;
in_quotes = 0; in_quotes = 0;
ptr++;
}
else
{
*lptr++ = *ptr++;
} }
ptr++;
} }
*lptr = 0;
args[i+1] = NULL; args[i+1] = NULL;
if (args[0] == NULL || *args[0] == 0) if (args[0] == NULL || *args[0] == 0)