Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1869a89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

tty: vt: fix up tabstops properly 



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: default avatarJames Holderness <j4_james@hotmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e43d40b3

drivers/tty/vt/vt.c

+4 −4
Original line number Diff line number Diff line
@@ -1727,7 +1727,7 @@ static void reset_terminal(struct vc_data *vc, int do_clear) 
	default_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[2]	=

	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);

		while (vc->vc_x < vc->vc_cols - 1) {

			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;

		}

		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);

			return;

		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;

		case 'Z':

			respond_ID(tty);
@@ -2024,7 +2024,7 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c) 
			return;

		case 'g':

			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) {

				vc->vc_tab_stop[0] =

					vc->vc_tab_stop[1] =