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

nsh/alias: Do not expand argument lists, only the command

Browse Source 
A resulting word that is identified to be the command name word of a
simple command shall be examined to determine whether it is an unquoted,
valid alias name.

The keyword here being "a simple command", arguments are not subject to
expansion.
This commit is contained in:
Ville Juven 2023-03-22 11:42:57 +02:00 committed by Petro Karashchenko
parent ad18a50282
commit e20d2688ab
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nshlib/nsh_parse.c
View File

@ -1809,7 +1809,7 @@ static FAR char *nsh_argument(FAR struct nsh_vtbl_s *vtbl,
#ifdef CONFIG_NSH_ALIAS
/* Expand aliases (if applicable) first, quoting prevents this */
if (!quoted)
if (alist && !quoted)
{
pbegin = nsh_aliasexpand(vtbl, pbegin, alist);
}
@ -2427,7 +2427,7 @@ static int nsh_parse_cmdparm(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline,
argv[0] = cmd;
for (argc = 1; argc < MAX_ARGV_ENTRIES - 1; argc++)
{
argv[argc] = nsh_argument(vtbl, &saveptr, &memlist, &alist, NULL);
argv[argc] = nsh_argument(vtbl, &saveptr, &memlist, NULL, NULL);
if (!argv[argc])
{
break;
@ -2571,7 +2571,7 @@ static int nsh_parse_command(FAR struct nsh_vtbl_s *vtbl, FAR char *cmdline)
{
int isenvvar = 0; /* flag for if an environment variable gets expanded */
argv[argc] = nsh_argument(vtbl, &saveptr, &memlist, &alist, &isenvvar);
argv[argc] = nsh_argument(vtbl, &saveptr, &memlist, NULL, &isenvvar);
if (!argv[argc])
{