提交 c1236d31 编写于 作者: S Samuel Thibault 提交者: Linus Torvalds

vt: fix canonical input in UTF-8 mode

For e.g.  proper TTY canonical support, IUTF8 termios flag has to be set as
appropriate.  Linux used to not care about setting that flag for VT TTYs.

This patch fixes that by activating it according to the current mode of the
VT, and sets the default value according to the vt.default_utf8 parameter.
Signed-off-by: NSamuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Willy Tarreau <w@1wt.eu>
Cc: <stable@kernel.org>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 ac7b77f1
...@@ -2742,6 +2742,10 @@ static int con_open(struct tty_struct *tty, struct file *filp) ...@@ -2742,6 +2742,10 @@ static int con_open(struct tty_struct *tty, struct file *filp)
tty->winsize.ws_row = vc_cons[currcons].d->vc_rows; tty->winsize.ws_row = vc_cons[currcons].d->vc_rows;
tty->winsize.ws_col = vc_cons[currcons].d->vc_cols; tty->winsize.ws_col = vc_cons[currcons].d->vc_cols;
} }
if (vc->vc_utf)
tty->termios->c_iflag |= IUTF8;
else
tty->termios->c_iflag &= ~IUTF8;
release_console_sem(); release_console_sem();
vcs_make_sysfs(tty); vcs_make_sysfs(tty);
return ret; return ret;
...@@ -2918,6 +2922,8 @@ int __init vty_init(void) ...@@ -2918,6 +2922,8 @@ int __init vty_init(void)
console_driver->minor_start = 1; console_driver->minor_start = 1;
console_driver->type = TTY_DRIVER_TYPE_CONSOLE; console_driver->type = TTY_DRIVER_TYPE_CONSOLE;
console_driver->init_termios = tty_std_termios; console_driver->init_termios = tty_std_termios;
if (default_utf8)
console_driver->init_termios.c_iflag |= IUTF8;
console_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS; console_driver->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_RESET_TERMIOS;
tty_set_operations(console_driver, &con_ops); tty_set_operations(console_driver, &con_ops);
if (tty_register_driver(console_driver)) if (tty_register_driver(console_driver))
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册