Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-11 14:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug: Ctrl+C does not send signal

Browse Source
This commit is contained in:
Jianfeng Jiang 2024-05-13 03:34:34 +00:00 committed by Tate, Hongliang Tian
parent 6f3a483be6
commit 0dd90cad3c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/aster-nix/src/device/tty/line_discipline.rs
View File

@ -115,11 +115,11 @@ impl LineDiscipline {
}; };
if self.may_send_signal(&termios, ch) { if self.may_send_signal(&termios, ch) {
// The char is already dealt with, so just return submit_work_item(self.work_item.clone(), WorkPriority::High);
return; // CBREAK mode may require the character to be outputted, so just go ahead.
} }
// Typically, a tty in raw mode does not echo. But the tty can also be in a cbreak mode, // Typically, a tty in raw mode does not echo. But the tty can also be in a CBREAK mode,
// with ICANON closed and ECHO opened. // with ICANON closed and ECHO opened.
if termios.contain_echo() { if termios.contain_echo() {
self.output_char(ch, &termios, echo_callback); self.output_char(ch, &termios, echo_callback);
@ -413,9 +413,9 @@ fn is_ctrl_char(ch: u8) -> bool {
(0..0x20).contains(&ch) (0..0x20).contains(&ch)
} }
fn get_printable_char(ctrl_char: u8) -> u8 { fn get_printable_char(ctrl_char: u8) -> char {
debug_assert!(is_ctrl_char(ctrl_char)); debug_assert!(is_ctrl_char(ctrl_char));
ctrl_char + b'A' - 1 char::from_u32((ctrl_char + b'A' - 1) as u32).unwrap()
} }
enum PolleeType { enum PolleeType {