apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-21 06:11:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

NSH: Loosen up if-then-else-fi syntx so that a command can be on the same line as the 'then' and 'else' tokens. This allows, as an example, 'if true; then echo true; else echo false; fi' which is much more bash-like

Browse Source
This commit is contained in:
Gregory Nutt
2014-01-17 18:03:23 -06:00
parent cfb7c77ed3
commit 45121c8709
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nshlib/nsh_parse.c
View File

@@ -1684,14 +1684,9 @@ static int nsh_itef(FAR struct nsh_vtbl_s *vtbl, FAR char **ppcmd,
else if (strcmp(cmd, "then") == 0)
{
/* Get the cmd following the "then" -- there shouldn't be one */
/* Get the cmd following the "then" -- there may or may not be one */
*ppcmd = nsh_argument(vtbl, saveptr, memlist);
if (*ppcmd)
{
nsh_output(vtbl, g_fmtarginvalid, "then");
goto errout;
}
/* Verify that "then" is valid in this context */
@@ -1708,14 +1703,9 @@ static int nsh_itef(FAR struct nsh_vtbl_s *vtbl, FAR char **ppcmd,
else if (strcmp(cmd, "else") == 0)
{
/* Get the cmd following the "else" -- there shouldn't be one */
/* Get the cmd following the "else" -- there may or may not be one */
*ppcmd = nsh_argument(vtbl, saveptr, memlist);
if (*ppcmd)
{
nsh_output(vtbl, g_fmtarginvalid, "else");
goto errout;
}
/* Verify that "else" is valid in this context */