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

CLE: Last bugfix commit was insufficient

Browse Source
This commit is contained in:
Gregory Nutt 2014-05-23 07:59:17 -06:00
parent f1fc923199
commit e6743f8370
1 changed files with 13 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
system/cle/cle.c
View File

@ -824,45 +824,31 @@ static int cle_editloop(FAR struct cle_s *priv)
} }
break; break;
/* Newline terminates editing */ /* Newline terminates editing. But what is a newline? */
#if defined(CONFIG_EOL_IS_CR) #if defined(CONFIG_EOL_IS_CR) || defined(CONFIG_EOL_IS_EITHER_CRLF)
case '\r': /* CR terminates line */ case '\r': /* CR terminates line */
{
/* Add the newline character to the buffer */
#elif defined(CONFIG_EOL_IS_LF) || defined(CONFIG_EOL_IS_BOTH_CRLF) || \
defined(CONFIG_EOL_IS_EITHER_CRLF)
case '\n': /* LF terminates line */
#endif
{
/* Add the newline character to the buffer at the end of the line */
priv->curpos = priv->nchars;
cle_insertch(priv, '\n'); cle_insertch(priv, '\n');
cle_putch(priv, '\n');
return OK; return OK;
} }
break; break;
#elif defined(CONFIG_EOL_IS_BOTH_CRLF) #if defined(CONFIG_EOL_IS_BOTH_CRLF)
case '\r': /* Wait for the LF */ case '\r': /* Wait for the LF */
break; break;
#endif #endif
#if defined(CONFIG_EOL_IS_LF) || defined(CONFIG_EOL_IS_BOTH_CRLF)
case '\n': /* LF terminates line */
{
/* Add the newline character to the buffer */
cle_insertch(priv, '\n');
return OK;
}
break;
#endif
#ifdef CONFIG_EOL_IS_EITHER_CRLF
case '\r': /* Either CR or LF terminates line */
case '\n':
{
/* Add the newline character to the buffer */
cle_insertch(priv, '\n');
return OK;
}
break;
#endif
/* Text to insert or unimplemented/invalid keypresses */ /* Text to insert or unimplemented/invalid keypresses */
default: default: