lkml.org 
[lkml]   [2018]   [Apr]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.18 19/93] tty: vt: fix up tabstops properly
    Date
    3.18-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Linus Torvalds <torvalds@linux-foundation.org>

    commit f1869a890cdedb92a3fab969db5d0fd982850273 upstream.

    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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/tty/vt/vt.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/tty/vt/vt.c
    +++ b/drivers/tty/vt/vt.c
    @@ -1705,7 +1705,7 @@ static void reset_terminal(struct vc_dat
    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] =
    @@ -1748,7 +1748,7 @@ static void do_con_trol(struct tty_struc
    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);
    @@ -1808,7 +1808,7 @@ static void do_con_trol(struct tty_struc
    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);
    @@ -2001,7 +2001,7 @@ static void do_con_trol(struct tty_struc
    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] =

    \
     
     \ /
      Last update: 2018-04-06 15:27    [W:2.195 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site