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

Revert "apps/nshlib: fix unreachable code about i++"

Browse Source 
This reverts commit 467de8ca83.
This commit is contained in:
Jiuzhu Dong 2022-05-07 11:52:31 +08:00 committed by Petro Karashchenko
parent b3a5b56ff3
commit 1f093da6a4
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
nshlib/nsh_session.c
View File

@ -70,6 +70,7 @@ int nsh_session(FAR struct console_stdio_s *pstate,
{
FAR struct nsh_vtbl_s *vtbl;
int ret = EXIT_FAILURE;
int i;
DEBUGASSERT(pstate);
vtbl = &pstate->cn_vtbl;
@ -115,40 +116,45 @@ int nsh_session(FAR struct console_stdio_s *pstate,
/* Process the command line option */
if (strcmp(argv[1], "-h") == 0)
for (i = 1; i < argc; i++)
{
nsh_output(vtbl, "Usage: %s [<script-path>|-c <command>]\n",
argv[0]);
return EXIT_SUCCESS;
}
else if (strcmp(argv[1], "-c") == 0)
{
/* Process the inline command */
if (strcmp(argv[i], "-h") == 0)
{
nsh_output(vtbl, "Usage: %s [<script-path>|-c <command>]\n",
argv[0]);
return EXIT_SUCCESS;
}
else if (strcmp(argv[i], "-c") == 0)
{
/* Process the inline command */
if (argc > 2)
{
return nsh_parse(vtbl, argv[2]);
if (i + 1 < argc)
{
return nsh_parse(vtbl, argv[i + 1]);
}
else
{
nsh_error(vtbl, g_fmtargrequired, argv[0]);
return EXIT_FAILURE;
}
}
else
else if (argv[i][0] != '-')
{
nsh_error(vtbl, g_fmtargrequired, argv[0]);
return EXIT_FAILURE;
break;
}
}
else if (argv[1][0] == '-')
{
/* Unknown option */
nsh_error(vtbl, g_fmtsyntax, argv[0]);
return EXIT_FAILURE;
}
if (argc > 1)
if (i < argc)
{
#ifndef CONFIG_NSH_DISABLESCRIPT
/* Execute the shell script */
return nsh_script(vtbl, argv[0], argv[1]);
return nsh_script(vtbl, argv[0], argv[i]);
#else
return EXIT_FAILURE;
#endif