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

apps/nshlib: Fix all places where cle() and readline() are used. readline() returns EOF on a failure. cle() returns a negated errno value. Checking only for EOF causes failues to be missed (and infinite loops ensuing).

Browse Source
This commit is contained in:
Valmantas Paliksa
2019-05-21 08:43:09 -06:00
committed by Gregory Nutt
parent 891ea23356
commit 5cad41c973
5 changed files with 128 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
nshlib/nsh_stdlogin.c
View File

@@ -1,7 +1,7 @@
/****************************************************************************
* apps/nshlib/nsh_stdlogin.c
*
* Copyright (C) 2016 Gregory Nutt. All rights reserved.
* Copyright (C) 2016, 2019 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
*
* Redistribution and use in source and binary forms, with or without
@@ -170,17 +170,22 @@ int nsh_stdlogin(FAR struct console_stdio_s *pstate)
printf("%s", g_userprompt);
/* Get the reponse, handling all possible cases */
#ifdef CONFIG_NSH_CLE
ret = cle(pstate->cn_line, CONFIG_NSH_LINELEN,
stdin, stdout);
#else
ret = std_readline(pstate->cn_line, CONFIG_NSH_LINELEN);
#endif
/* Get the response, handling all possible cases */
username[0] = '\0';
#ifdef CONFIG_NSH_CLE
/* cle() returns a negated errno value on failure */
ret = cle(pstate->cn_line, CONFIG_NSH_LINELEN,
stdin, stdout);
if (ret >= 0)
#else
/* readline() returns EOF on failure */
ret = std_readline(pstate->cn_line, CONFIG_NSH_LINELEN);
if (ret != EOF)
#endif
{
/* Parse out the username */