forked from luck/tmp_suning_uos_patched
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: Samuel Thibault <samuel.thibault@ens-lyon.org> Cc: Willy Tarreau <w@1wt.eu> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ac7b77f13f
commit
c1236d31a1
@ -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_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();
|
||||
vcs_make_sysfs(tty);
|
||||
return ret;
|
||||
@ -2918,6 +2922,8 @@ int __init vty_init(void)
|
||||
console_driver->minor_start = 1;
|
||||
console_driver->type = TTY_DRIVER_TYPE_CONSOLE;
|
||||
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;
|
||||
tty_set_operations(console_driver, &con_ops);
|
||||
if (tty_register_driver(console_driver))
|
||||
|
Loading…
Reference in New Issue
Block a user