Skip to content
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

Merged
merged 1 commit into from
Nov 5, 2024

Conversation

judecumt
Copy link
Contributor

@judecumt judecumt commented Oct 25, 2024

拉取/合并请求描述:(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):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification

@CLAassistant
Copy link

CLAassistant commented Oct 25, 2024

CLA assistant check
All committers have signed the CLA.

@@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

主线不需要区分版本号呀
直接保留最新版本的代码段即可

Copy link
Contributor Author

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?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

没关系 合并之后我来cherrypick到其他分支

Copy link
Contributor Author

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)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这块有问题呀,为什么直接使用STDIN_FILENO标准文件描述符不可以呢?

Copy link
Contributor Author

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

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

请麻烦单独提一个PR 至保留针对当前版本的代码 无需考虑之前版本的兼容,后续我会根据这个PR重新cherry-pick到其他分支

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

已修改

@mysterywolf mysterywolf merged commit bdf5a1f into RT-Thread:master Nov 5, 2024
44 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants