apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-18 08:52:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

nshlib: Reuse nsh_session logic in nsh_telnetmain

Browse Source 
to avoid the code duplication

Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao
2022-10-17 05:17:41 +08:00
committed by Alan Carvalho de Assis
parent 8e460e7e19
commit 75455d3788
8 changed files with 55 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nshlib/nsh_session.c
View File

@@ -66,7 +66,7 @@
****************************************************************************/
int nsh_session(FAR struct console_stdio_s *pstate,
bool login, int argc, FAR char *argv[])
int login, int argc, FAR char *argv[])
{
FAR struct nsh_vtbl_s *vtbl;
int ret = EXIT_FAILURE;
@@ -74,9 +74,9 @@ int nsh_session(FAR struct console_stdio_s *pstate,
DEBUGASSERT(pstate);
vtbl = &pstate->cn_vtbl;
if (login)
{
#ifdef CONFIG_NSH_CONSOLE_LOGIN
if (login == NSH_LOGIN_LOCAL)
{
/* Login User and Password Check */
if (nsh_login(pstate) != OK)
@@ -84,8 +84,24 @@ int nsh_session(FAR struct console_stdio_s *pstate,
nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */
}
}
else
#endif /* CONFIG_NSH_CONSOLE_LOGIN */
#ifdef CONFIG_NSH_TELNET_LOGIN
if (login == NSH_LOGIN_TELNET)
{
/* Login User and Password Check */
if (nsh_telnetlogin(pstate) != OK)
{
nsh_exit(vtbl, 1);
return -1; /* nsh_exit does not return */
}
}
#endif /* CONFIG_NSH_TELNET_LOGIN */
if (login != NSH_LOGIN_NONE)
{
/* Present a greeting and possibly a Message of the Day (MOTD) */
fputs(g_nshgreeting, pstate->cn_outstream);