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

Backs out most of commit 093391fcff414b08e8f91d949edb896614eb2347. I was confused. I re-emplemented a feature that already existed. Silly me.

Browse Source
This commit is contained in:
Gregory Nutt 2018-08-11 10:47:46 -06:00
parent a7f4a9db23
commit f759ad3196
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nshlib/README.txt
View File

@ -268,7 +268,7 @@ file system image.
Simple Commands Simple Commands
^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^
o [ [!] <expression> ] o [ <expression> ]
o test <expression> o test <expression>
These are two alternative forms of the same command. They support These are two alternative forms of the same command. They support

24
nshlib/nsh_test.c
View File

@ -442,28 +442,12 @@ int cmd_lbracket(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
nsh_output(vtbl, g_fmtsyntax, argv[0]); nsh_output(vtbl, g_fmtsyntax, argv[0]);
return ERROR; return ERROR;
} }
else
{
bool inverted = false;
int index = 1;
int result;
/* Check if the expression is inverted */ /* Then perform the test on the arguments enclosed by the left and right
* brackets.
*/
if (strcmp(argv[index], "!") == 0) return expression(vtbl, argc - 2, &argv[1]);
{
index++;
inverted = true;
}
result = expression(vtbl, argc - index - 1, &argv[index]);
if (inverted && result != TEST_ERROR)
{
result = (result == TEST_TRUE ? TEST_FALSE : TEST_TRUE);
}
return result;
}
} }
#endif /* !CONFIG_NSH_DISABLESCRIPT && !CONFIG_NSH_DISABLE_TEST */ #endif /* !CONFIG_NSH_DISABLESCRIPT && !CONFIG_NSH_DISABLE_TEST */