riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shell: let readline return an error on empty line so prompt gets print again

Browse Source
This commit is contained in:
Kaspar Schleiser 2015-04-29 20:53:03 +02:00
parent 2d7642b8c1
commit adabd8c930
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/shell/shell.c
View File

@ -223,15 +223,12 @@ static int readline(shell_t *shell, char *buf, size_t size)
/* QEMU transmits only a single '\r' == 13 on hitting enter ("-serial stdio"). */ /* QEMU transmits only a single '\r' == 13 on hitting enter ("-serial stdio"). */
/* DOS newlines are handled like hitting enter twice, but empty lines are ignored. */ /* DOS newlines are handled like hitting enter twice, but empty lines are ignored. */
if (c == '\r' || c == '\n') { if (c == '\r' || c == '\n') {
if (line_buf_ptr == buf) {
/* The line is empty. */
continue;
}
*line_buf_ptr = '\0'; *line_buf_ptr = '\0';
shell->put_char('\r'); shell->put_char('\r');
shell->put_char('\n'); shell->put_char('\n');
return 0;
/* return 1 if line is empty, 0 otherwise */
return line_buf_ptr == buf;
} }
/* QEMU uses 0x7f (DEL) as backspace, while 0x08 (BS) is for most terminals */ /* QEMU uses 0x7f (DEL) as backspace, while 0x08 (BS) is for most terminals */
else if (c == 0x08 || c == 0x7f) { else if (c == 0x08 || c == 0x7f) {
@ -257,7 +254,11 @@ static inline void print_prompt(shell_t *shell)
{ {
shell->put_char('>'); shell->put_char('>');
shell->put_char(' '); shell->put_char(' ');
#ifdef MODULE_NEWLIB
fflush(stdout); fflush(stdout);
#endif
return; return;
} }