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

apps/nshlib: fix unreachable code about i++

Browse Source 
Report by the tool coverity

Signed-off-by: Jiuzhu Dong <dongjiuzhu1@xiaomi.com>
This commit is contained in:
Jiuzhu Dong 2022-05-05 11:25:47 +08:00 committed by Xiang Xiao
parent 385603666b
commit 467de8ca83
1 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nshlib/nsh_session.c
View File

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