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

nshlib/stdsession: Handle the command arguments in any order

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-11-09 23:24:21 +08:00 committed by Gustavo Henrique Nihei
parent ad09ca2a80
commit 850c036c58
1 changed files with 91 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

157
nshlib/nsh_stdsession.c
View File

@ -69,6 +69,7 @@ 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;
@ -110,85 +111,109 @@ int nsh_session(FAR struct console_stdio_s *pstate,
#endif #endif
} }
if (argc < 2) /* Process the command line option */
{
/* Then enter the command line parsing loop */
for (; ; ) for (i = 1; i < argc; i++)
{
if (strcmp(argv[i], "-h") == 0)
{ {
/* For the case of debugging the USB console... nsh_output(vtbl, "Usage: %s [<script-path>|-c <command>]\n",
* dump collected USB trace data argv[0]);
*/ return EXIT_SUCCESS;
#ifdef CONFIG_NSH_USBDEV_TRACE
nsh_usbtrace();
#endif
/* Get the next line of input. readline() returns EOF
* on end-of-file or any read failure.
*/
#ifdef CONFIG_NSH_CLE
/* cle() normally returns the number of characters read, but will
* return a negated errno value on end of file or if an error
* occurs. Either will cause the session to terminate.
*/
ret = cle(pstate->cn_line, g_nshprompt, CONFIG_NSH_LINELEN,
stdin, stdout);
if (ret < 0)
{
printf(g_fmtcmdfailed, "nsh_session",
"cle", NSH_ERRNO_OF(-ret));
continue;
}
#else
/* Display the prompt string */
printf("%s", g_nshprompt);
/* readline() normally returns the number of characters read, but
* will return EOF on end of file or if an error occurs. EOF
* will cause the session to terminate.
*/
ret = std_readline(pstate->cn_line, CONFIG_NSH_LINELEN);
if (ret == EOF)
{
/* NOTE: readline() does not set the errno variable, but
* perhaps we will be lucky and it will still be valid.
*/
printf(g_fmtcmdfailed, "nsh_session",
"readline", NSH_ERRNO);
ret = EXIT_SUCCESS;
break;
}
#endif
/* Parse process the command */
nsh_parse(vtbl, pstate->cn_line);
} }
else if (strcmp(argv[i], "-c") == 0)
{
/* Process the inline command */
if (i + 1 < argc)
{
return nsh_parse(vtbl, argv[i + 1]);
}
else
{
nsh_error(vtbl, g_fmtargrequired, argv[0]);
return EXIT_FAILURE;
}
}
else if (argv[i][0] != '-')
{
break;
}
/* Unknown option */
nsh_error(vtbl, g_fmtsyntax, argv[0]);
return EXIT_FAILURE;
} }
else if (strcmp(argv[1], "-h") == 0)
{ if (i < argc)
ret = nsh_output(vtbl, "Usage: %s [<script-path>|-c <command>]\n",
argv[0]);
}
else if (strcmp(argv[1], "-c") != 0)
{ {
#ifndef CONFIG_NSH_DISABLESCRIPT #ifndef CONFIG_NSH_DISABLESCRIPT
/* Execute the shell script */ /* Execute the shell script */
ret = nsh_script(vtbl, argv[0], argv[1]); return nsh_script(vtbl, argv[0], argv[i]);
#else
return EXIT_FAILURE;
#endif #endif
} }
else if (argc >= 3)
/* Then enter the command line parsing loop */
for (; ; )
{ {
/* For the case of debugging the USB console...
* dump collected USB trace data
*/
#ifdef CONFIG_NSH_USBDEV_TRACE
nsh_usbtrace();
#endif
/* Get the next line of input. readline() returns EOF
* on end-of-file or any read failure.
*/
#ifdef CONFIG_NSH_CLE
/* cle() normally returns the number of characters read, but will
* return a negated errno value on end of file or if an error
* occurs. Either will cause the session to terminate.
*/
ret = cle(pstate->cn_line, g_nshprompt, CONFIG_NSH_LINELEN,
stdin, stdout);
if (ret < 0)
{
printf(g_fmtcmdfailed, "nsh_session",
"cle", NSH_ERRNO_OF(-ret));
continue;
}
#else
/* Display the prompt string */
printf("%s", g_nshprompt);
/* readline() normally returns the number of characters read, but
* will return EOF on end of file or if an error occurs. EOF
* will cause the session to terminate.
*/
ret = std_readline(pstate->cn_line, CONFIG_NSH_LINELEN);
if (ret == EOF)
{
/* NOTE: readline() does not set the errno variable, but
* perhaps we will be lucky and it will still be valid.
*/
printf(g_fmtcmdfailed, "nsh_session",
"readline", NSH_ERRNO);
ret = EXIT_SUCCESS;
break;
}
#endif
/* Parse process the command */ /* Parse process the command */
ret = nsh_parse(vtbl, argv[2]); nsh_parse(vtbl, pstate->cn_line);
} }
return ret; return ret;