sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

nsh/nsh_parse.c: Fix variable expansion inside double quotes

Browse Source 
This also prevents expanding anything when inside single quotes, for
full POSIX compliance.
This commit is contained in:
Ville Juven 2023-03-14 11:14:08 +02:00 committed by Petro Karashchenko
parent f9dfb51001
commit ad18a50282
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nshlib/nsh_parse.c
View File

@ -1638,6 +1638,7 @@ static FAR char *nsh_argument(FAR struct nsh_vtbl_s *vtbl,
FAR char *prev;
bool escaped;
#endif
bool squote;
bool quoted;
/* Find the beginning of the next token */
@ -1694,6 +1695,7 @@ static FAR char *nsh_argument(FAR struct nsh_vtbl_s *vtbl,
* make sure that we do not break up any quoted substrings.
*/
squote = false;
quoted = false;
#ifdef CONFIG_NSH_QUOTE
escaped = false;
@ -1747,6 +1749,24 @@ static FAR char *nsh_argument(FAR struct nsh_vtbl_s *vtbl,
return NULL;
}
/* Is it a single-quote ? No expansion allowed */
if (*pend == '\'')
{
/* Yes, do not allow any expansions whatsoever */
squote = true;
}
/* Is it a double-quote ? Variable expansion is allowed */
if (*pend == '"')
{
/* Don't split env variable if inside double quotes */
isenvvar = NULL;
}
/* Is it a back-quote ? These are not removed here */
if (*pend != '`')
@ -1797,7 +1817,14 @@ static FAR char *nsh_argument(FAR struct nsh_vtbl_s *vtbl,
/* Perform expansions as necessary for the argument */
argument = nsh_argexpand(vtbl, pbegin, &allocation, isenvvar);
if (squote)
{
argument = pbegin;
}
else
{
argument = nsh_argexpand(vtbl, pbegin, &allocation, isenvvar);
}
}
/* If any memory was allocated for this argument, make sure that it is