-
Notifications
You must be signed in to change notification settings - Fork 5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[components][finsh]在RT_USING_POSIX_STDIO时,使用get_console获取当前console描述符 #9581
Conversation
components/finsh/shell.c
Outdated
@@ -149,12 +149,25 @@ void finsh_set_prompt_mode(rt_uint32_t prompt_mode) | |||
shell->prompt_mode = prompt_mode; | |||
} | |||
|
|||
#ifdef RT_USING_POSIX_STDIO | |||
#if RT_VER_NUM >= 0x50100 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
主线不需要区分版本号呀
直接保留最新版本的代码段即可
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
嗯 搜了下确实master里边没有这种宏
如果有个bug,master v5.1.x等多个分支都需要修复,应该怎么操作呢?每个分支都提交修复commit?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
没关系 合并之后我来cherrypick到其他分支
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
但是这里的libc.h
以及get_console
接口在 b08d867 这个commit被重构了,作者是你,如果不加版本宏区分是不能直接cherrypick的
int finsh_getchar(void) | ||
{ | ||
#ifdef RT_USING_DEVICE | ||
char ch = 0; | ||
#ifdef RT_USING_POSIX_STDIO | ||
if(read(STDIN_FILENO, &ch, 1) > 0) | ||
#if RT_VER_NUM >= 0x50100 | ||
if(read(rt_posix_stdio_get_console(), &ch, 1) > 0) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这块有问题呀,为什么直接使用STDIN_FILENO标准文件描述符不可以呢?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
实测打开telnet时,调用set_console的api后,STDIN_FILENO不起作用,无法获取输入,telnet我也有修改 RT-Thread-packages/netutils#105
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
请麻烦单独提一个PR 至保留针对当前版本的代码 无需考虑之前版本的兼容,后续我会根据这个PR重新cherry-pick到其他分支
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
已修改
拉取/合并请求描述:(PR description)
[
为什么提交这份PR (why to submit this PR)
使用telnet,并打开RT_USING_POSIX_STDIO时,需使用get_console来get_char,否则不能正确获取输入
你的解决方案是什么 (what is your solution)
get_char时使用get_console获取console描述符
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality:
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0
代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up