RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Merge pull request #877 from Kijewski/shell-utf8

Browse Source 
shell: fix UTF-8 problem
This commit is contained in:
René Kijewski 2014-03-18 11:27:28 +01:00
commit e073d86845
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/shell/shell.c
View File

@ -10,20 +10,21 @@
*/
/**
* @ingroup shell
* @ingroup shell
* @{
*/
/**
* @file
* @brief Implementation of a very simple command interpreter.
* @brief Implementation of a very simple command interpreter.
* For each command (i.e. "echo"), a handler can be specified.
* If the first word of a user-entered command line matches the
* name of a handler, the handler will be called with the whole
* command line as parameter.
*
* @author Freie Universität Berlin, Computer Systems & Telematics
* @author Kaspar Schleiser <kaspar@schleiser.de>
* @author Kaspar Schleiser <kaspar@schleiser.de>
* @author René Kijewski <rene.kijewski@fu-berlin.de>
*/
#include <string.h>
@ -97,7 +98,7 @@ static void handle_input_line(shell_t *shell, char *line)
char *pos = line;
int contains_esc_seq = 0;
while (1) {
if (*pos > ' ') {
if ((unsigned char) *pos > ' ') {
/* found an argument */
if (*pos == '"' || *pos == '\'') {
/* it's a quoted argument */
@ -119,7 +120,7 @@ static void handle_input_line(shell_t *shell, char *line)
continue;
}
} while (*pos != quote_char);
if (pos[1] > ' ') {
if ((unsigned char) pos[1] > ' ') {
puts(INCORRECT_QUOTING);
return;
}
@ -141,7 +142,7 @@ static void handle_input_line(shell_t *shell, char *line)
puts(INCORRECT_QUOTING);
return;
}
} while (*pos > ' ');
} while ((unsigned char) *pos > ' ');
}
/* count the number of arguments we got */
@ -217,6 +218,9 @@ static int readline(shell_t *shell, char *buf, size_t size)
}
c = shell->readchar();
if (c < 0) {
return 1;
}
shell->put_char(c);
/* We allow Unix linebreaks (\n), DOS linebreaks (\r\n), and Mac linebreaks (\r). */

9
tests/test_shell/main.c
View File

@ -52,9 +52,12 @@ static void print_echo(int argc, char **argv)
static int shell_readc(void)
{
char c = 0;
posix_read(uart0_handler_pid, &c, 1);
return c;
char c;
int result = posix_read(uart0_handler_pid, &c, 1);
if (result != 1) {
return -1;
}
return (unsigned char) c;
}
static void shell_putchar(int c)