iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tty: vt: fix up tabstops properly

Browse Source 
Tabs on a console with long lines do not wrap properly, so correctly
account for the line length when computing the tab placement location.

Reported-by: James Holderness <j4_james@hotmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2018-03-24 10:43:26 +01:00
parent e43d40b321
commit f1869a890c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/tty/vt/vt.c
View File

@ -1727,7 +1727,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear)
default_attr(vc); default_attr(vc);
update_attr(vc); update_attr(vc);
vc->vc_tab_stop[0] = 0x01010100; vc->vc_tab_stop[0] =
vc->vc_tab_stop[1] = vc->vc_tab_stop[1] =
vc->vc_tab_stop[2] = vc->vc_tab_stop[2] =
vc->vc_tab_stop[3] = vc->vc_tab_stop[3] =
@ -1771,7 +1771,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
vc->vc_pos -= (vc->vc_x << 1); vc->vc_pos -= (vc->vc_x << 1);
while (vc->vc_x < vc->vc_cols - 1) { while (vc->vc_x < vc->vc_cols - 1) {
vc->vc_x++; vc->vc_x++;
if (vc->vc_tab_stop[vc->vc_x >> 5] & (1 << (vc->vc_x & 31))) if (vc->vc_tab_stop[7 & (vc->vc_x >> 5)] & (1 << (vc->vc_x & 31)))
break; break;
} }
vc->vc_pos += (vc->vc_x << 1); vc->vc_pos += (vc->vc_x << 1);
@ -1831,7 +1831,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
lf(vc); lf(vc);
return; return;
case 'H': case 'H':
vc->vc_tab_stop[vc->vc_x >> 5] |= (1 << (vc->vc_x & 31)); vc->vc_tab_stop[7 & (vc->vc_x >> 5)] |= (1 << (vc->vc_x & 31));
return; return;
case 'Z': case 'Z':
respond_ID(tty); respond_ID(tty);
@ -2024,7 +2024,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
return; return;
case 'g': case 'g':
if (!vc->vc_par[0]) if (!vc->vc_par[0])
vc->vc_tab_stop[vc->vc_x >> 5] &= ~(1 << (vc->vc_x & 31)); vc->vc_tab_stop[7 & (vc->vc_x >> 5)] &= ~(1 << (vc->vc_x & 31));
else if (vc->vc_par[0] == 3) { else if (vc->vc_par[0] == 3) {
vc->vc_tab_stop[0] = vc->vc_tab_stop[0] =
vc->vc_tab_stop[1] = vc->vc_tab_stop[1] =