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

nshlib: Add login argument to nsh_session for controling the login process

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2020-04-18 23:53:32 +08:00 committed by patacongo
parent 7b4d34e352
commit 9ab5e2ff45
6 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nshlib/nsh.h
View File

@ -860,7 +860,7 @@ int nsh_loginscript(FAR struct nsh_vtbl_s *vtbl);
/* Basic session and message handling */ /* Basic session and message handling */
struct console_stdio_s; struct console_stdio_s;
int nsh_session(FAR struct console_stdio_s *pstate); int nsh_session(FAR struct console_stdio_s *pstate, bool login);
int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline); int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline);
/**************************************************************************** /****************************************************************************

2
nshlib/nsh_altconsole.c
View File

@ -317,7 +317,7 @@ int nsh_consolemain(int argc, char *argv[])
/* Execute the session */ /* Execute the session */
nsh_session(pstate); nsh_session(pstate, true);
/* We lost the connection. Wait for the keyboard to /* We lost the connection. Wait for the keyboard to
* be re-connected. * be re-connected.

2
nshlib/nsh_consolemain.c
View File

@ -106,7 +106,7 @@ int nsh_consolemain(int argc, char *argv[])
/* Execute the session */ /* Execute the session */
ret = nsh_session(pstate); ret = nsh_session(pstate, true);
/* Exit upon return */ /* Exit upon return */

5
nshlib/nsh_session.c
View File

@ -79,7 +79,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_session(FAR struct console_stdio_s *pstate) int nsh_session(FAR struct console_stdio_s *pstate, bool login)
{ {
FAR struct nsh_vtbl_s *vtbl; FAR struct nsh_vtbl_s *vtbl;
int ret; int ret;
@ -87,6 +87,8 @@ int nsh_session(FAR struct console_stdio_s *pstate)
DEBUGASSERT(pstate); DEBUGASSERT(pstate);
vtbl = &pstate->cn_vtbl; vtbl = &pstate->cn_vtbl;
if (login)
{
#ifdef CONFIG_NSH_CONSOLE_LOGIN #ifdef CONFIG_NSH_CONSOLE_LOGIN
/* Login User and Password Check */ /* Login User and Password Check */
@ -122,6 +124,7 @@ int nsh_session(FAR struct console_stdio_s *pstate)
#ifdef CONFIG_NSH_ROMFSRC #ifdef CONFIG_NSH_ROMFSRC
nsh_loginscript(vtbl); nsh_loginscript(vtbl);
#endif #endif
}
/* Then enter the command line parsing loop */ /* Then enter the command line parsing loop */

5
nshlib/nsh_stdsession.c
View File

@ -76,7 +76,7 @@
* *
****************************************************************************/ ****************************************************************************/
int nsh_session(FAR struct console_stdio_s *pstate) int nsh_session(FAR struct console_stdio_s *pstate, bool login)
{ {
FAR struct nsh_vtbl_s *vtbl; FAR struct nsh_vtbl_s *vtbl;
int ret; int ret;
@ -84,6 +84,8 @@ int nsh_session(FAR struct console_stdio_s *pstate)
DEBUGASSERT(pstate); DEBUGASSERT(pstate);
vtbl = &pstate->cn_vtbl; vtbl = &pstate->cn_vtbl;
if (login)
{
#ifdef CONFIG_NSH_CONSOLE_LOGIN #ifdef CONFIG_NSH_CONSOLE_LOGIN
/* Login User and Password Check */ /* Login User and Password Check */
@ -112,6 +114,7 @@ int nsh_session(FAR struct console_stdio_s *pstate)
# endif # endif
#endif #endif
}
/* Then enter the command line parsing loop */ /* Then enter the command line parsing loop */

2
nshlib/nsh_usbconsole.c
View File

@ -339,7 +339,7 @@ int nsh_consolemain(int argc, char *argv[])
/* Execute the session */ /* Execute the session */
nsh_session(pstate); nsh_session(pstate, true);
/* Switch to /dev/null because we probably no longer have a /* Switch to /dev/null because we probably no longer have a
* valid console device. * valid console device.