summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-10-30 06:58:43 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-10-30 06:58:43 -0600
commit42d1624c5c013ecc75ad565d04468a74f1ee7b7c (patch)
tree2b46e0e047247830deca9216f5e1ee7719cba1f3 /apps
parent0b18779e58354a793217ac0180ea256ff710231a (diff)
parent7eb86bb3f5aa4cfb83a4a1f3b05182f538142db0 (diff)
downloadnuttx-42d1624c5c013ecc75ad565d04468a74f1ee7b7c.tar.gz
nuttx-42d1624c5c013ecc75ad565d04468a74f1ee7b7c.tar.bz2
nuttx-42d1624c5c013ecc75ad565d04468a74f1ee7b7c.zip
Merge remote-tracking branch 'origin/master' into bas24
Diffstat (limited to 'apps')
-rw-r--r--apps/nshlib/nsh_telnetd.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c
index d76308f42..0602081cb 100644
--- a/apps/nshlib/nsh_telnetd.c
+++ b/apps/nshlib/nsh_telnetd.c
@@ -112,12 +112,13 @@ static void nsh_telnetecho(FAR struct console_stdio_s *pstate, uint8_t is_use)
* Name: nsh_telnettoken
****************************************************************************/
-static nsh_telnettoken(FAR struct console_stdio_s *pstate, FAR char *buffer,
- size_t buflen)
+#ifdef CONFIG_NSH_TELNET_LOGIN
+static void nsh_telnettoken(FAR struct console_stdio_s *pstate,
+ FAR char *buffer, size_t buflen)
{
FAR char *start;
FAR char *endp1;
- bool quoated = false;
+ bool quoted = false;
/* Find the start of token. Either (1) the first non-white space
* character on the command line or (2) the character immediately after
@@ -154,7 +155,7 @@ static nsh_telnettoken(FAR struct console_stdio_s *pstate, FAR char *buffer,
* any whitespace.
*/
- for (endp1 = start; *endp1; endp1++);
+ for (endp1 = start; *endp1; endp1++)
{
/* Did the token begin with a quotation mark? */
@@ -190,6 +191,7 @@ static nsh_telnettoken(FAR struct console_stdio_s *pstate, FAR char *buffer,
strncpy(buffer, start, buflen);
}
+#endif
/****************************************************************************
* Name: nsh_telnetlogin