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

nshlib: sync nsh_stdsession.c with nsh_session.c

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2021-11-09 22:58:08 +08:00 committed by Gustavo Henrique Nihei
parent a0f773b318
commit ad09ca2a80
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nshlib/nsh_session.c
View File

@ -92,17 +92,17 @@ int nsh_session(FAR struct console_stdio_s *pstate,
fputs(g_nshgreeting, pstate->cn_outstream); fputs(g_nshgreeting, pstate->cn_outstream);
#ifdef CONFIG_NSH_MOTD #ifdef CONFIG_NSH_MOTD
#ifdef CONFIG_NSH_PLATFORM_MOTD # ifdef CONFIG_NSH_PLATFORM_MOTD
/* Output the platform message of the day */ /* Output the platform message of the day */
platform_motd(vtbl->iobuffer, IOBUFFERSIZE); platform_motd(vtbl->iobuffer, IOBUFFERSIZE);
fprintf(pstate->cn_outstream, "%s\n", vtbl->iobuffer); fprintf(pstate->cn_outstream, "%s\n", vtbl->iobuffer);
#else # else
/* Output the fixed message of the day */ /* Output the fixed message of the day */
fprintf(pstate->cn_outstream, "%s\n", g_nshmotd); fprintf(pstate->cn_outstream, "%s\n", g_nshmotd);
#endif # endif
#endif #endif
fflush(pstate->cn_outstream); fflush(pstate->cn_outstream);

37
nshlib/nsh_stdsession.c
View File

@ -46,11 +46,12 @@
* Name: nsh_session * Name: nsh_session
* *
* Description: * Description:
* This is the common session logic or an NSH session that uses only stdin * This is the common session login on any NSH session that uses only stdin
* and stdout. * and stdout.
* *
* This function: * This function:
* - Executes the NSH logic script * - Performs the login sequence if so configured
* - Executes the NSH login script
* - Presents a greeting * - Presents a greeting
* - Then provides a prompt then gets and processes the command line. * - Then provides a prompt then gets and processes the command line.
* - This continues until an error occurs, then the session returns. * - This continues until an error occurs, then the session returns.
@ -58,6 +59,9 @@
* Input Parameters: * Input Parameters:
* pstate - Abstracts the underlying session. * pstate - Abstracts the underlying session.
* *
* Returned Values:
* EXIT_SUCCESS or EXIT_FAILURE is returned.
*
****************************************************************************/ ****************************************************************************/
int nsh_session(FAR struct console_stdio_s *pstate, int nsh_session(FAR struct console_stdio_s *pstate,
@ -96,8 +100,13 @@ int nsh_session(FAR struct console_stdio_s *pstate,
/* Output the fixed message of the day */ /* Output the fixed message of the day */
printf("%s\n", g_nshmotd); printf("%s\n", g_nshmotd);
# endif # endif
#endif
/* Execute the login script */
#ifdef CONFIG_NSH_ROMFSRC
nsh_loginscript(vtbl);
#endif #endif
} }
@ -115,20 +124,22 @@ int nsh_session(FAR struct console_stdio_s *pstate,
nsh_usbtrace(); nsh_usbtrace();
#endif #endif
/* Get the next line of input. */ /* Get the next line of input. readline() returns EOF
* on end-of-file or any read failure.
*/
#ifdef CONFIG_NSH_CLE #ifdef CONFIG_NSH_CLE
/* cle() normally returns the number of characters read, but will /* cle() normally returns the number of characters read, but will
* return a negated errno value on end of file or if an error * return a negated errno value on end of file or if an error
* occurs. Either will cause the session to terminate. * occurs. Either will cause the session to terminate.
*/ */
ret = cle(pstate->cn_line, g_nshprompt, CONFIG_NSH_LINELEN, ret = cle(pstate->cn_line, g_nshprompt, CONFIG_NSH_LINELEN,
stdin, stdout); stdin, stdout);
if (ret < 0) if (ret < 0)
{ {
printf(g_fmtcmdfailed, printf(g_fmtcmdfailed, "nsh_session",
"nsh_session", "cle", NSH_ERRNO_OF(-ret)); "cle", NSH_ERRNO_OF(-ret));
continue; continue;
} }
#else #else
@ -136,8 +147,8 @@ int nsh_session(FAR struct console_stdio_s *pstate,
printf("%s", g_nshprompt); printf("%s", g_nshprompt);
/* readline () normally returns the number of characters read, but /* readline() normally returns the number of characters read, but
* will return EOF on end of file or if an error occurs. Either * will return EOF on end of file or if an error occurs. EOF
* will cause the session to terminate. * will cause the session to terminate.
*/ */
@ -148,7 +159,8 @@ int nsh_session(FAR struct console_stdio_s *pstate,
* perhaps we will be lucky and it will still be valid. * perhaps we will be lucky and it will still be valid.
*/ */
printf(g_fmtcmdfailed, "nsh_session", "readline", NSH_ERRNO); printf(g_fmtcmdfailed, "nsh_session",
"readline", NSH_ERRNO);
ret = EXIT_SUCCESS; ret = EXIT_SUCCESS;
break; break;
} }
@ -166,7 +178,7 @@ int nsh_session(FAR struct console_stdio_s *pstate,
} }
else if (strcmp(argv[1], "-c") != 0) else if (strcmp(argv[1], "-c") != 0)
{ {
#if defined(CONFIG_FILE_STREAM) && !defined(CONFIG_NSH_DISABLESCRIPT) #ifndef CONFIG_NSH_DISABLESCRIPT
/* Execute the shell script */ /* Execute the shell script */
ret = nsh_script(vtbl, argv[0], argv[1]); ret = nsh_script(vtbl, argv[0], argv[1]);
@ -177,9 +189,6 @@ int nsh_session(FAR struct console_stdio_s *pstate,
/* Parse process the command */ /* Parse process the command */
ret = nsh_parse(vtbl, argv[2]); ret = nsh_parse(vtbl, argv[2]);
#ifdef CONFIG_FILE_STREAM
fflush(pstate->cn_outstream);
#endif
} }
return ret; return ret;