libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #2414 from gbcwbz/finsh 

[finsh] change return type of finsh_getchar from ch to int
This commit is contained in:
Bernard Xiong 2019-03-11 09:44:49 +08:00 committed by GitHub
parent a4f16ed41f 860f8d954d
commit 359d570061
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
components/finsh/shell.c
View File

@ -134,12 +134,12 @@ void finsh_set_prompt_mode(rt_uint32_t prompt_mode)
shell->prompt_mode = prompt_mode; shell->prompt_mode = prompt_mode;
} }
static char finsh_getchar(void) static int finsh_getchar(void)
{ {
#ifdef RT_USING_POSIX #ifdef RT_USING_POSIX
return getchar(); return getchar();
#else #else
char ch; int ch;
RT_ASSERT(shell != RT_NULL); RT_ASSERT(shell != RT_NULL);
while (rt_device_read(shell->device, -1, &ch, 1) != 1) while (rt_device_read(shell->device, -1, &ch, 1) != 1)
@ -279,7 +279,7 @@ const char *finsh_get_password(void)
static void finsh_wait_auth(void) static void finsh_wait_auth(void)
{ {
char ch; int ch;
rt_bool_t input_finish = RT_FALSE; rt_bool_t input_finish = RT_FALSE;
char password[FINSH_PASSWORD_MAX] = { 0 }; char password[FINSH_PASSWORD_MAX] = { 0 };
rt_size_t cur_pos = 0; rt_size_t cur_pos = 0;
@ -295,6 +295,11 @@ static void finsh_wait_auth(void)
{ {
/* read one character from device */ /* read one character from device */
ch = finsh_getchar(); ch = finsh_getchar();
if (ch < 0)
{
rt_kprintf("finsh getchar error\n");
continue;
}
if (ch >= ' ' && ch <= '~' && cur_pos < FINSH_PASSWORD_MAX) if (ch >= ' ' && ch <= '~' && cur_pos < FINSH_PASSWORD_MAX)
{ {
@ -460,7 +465,7 @@ static void shell_push_history(struct finsh_shell *shell)
void finsh_thread_entry(void *parameter) void finsh_thread_entry(void *parameter)
{ {
char ch; int ch;
/* normal is echo mode */ /* normal is echo mode */
#ifndef FINSH_ECHO_DISABLE_DEFAULT #ifndef FINSH_ECHO_DISABLE_DEFAULT
@ -503,6 +508,11 @@ void finsh_thread_entry(void *parameter)
while (1) while (1)
{ {
ch = finsh_getchar(); ch = finsh_getchar();
if (ch < 0)
{
rt_kprintf("finsh getchar error\n");
continue;
}
/* /*
* handle control key * handle control key