lkml.org 
[lkml]   [2009]   [Sep]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [Bug #14015] pty regressed again, breaking expect and gcc's testsuite


    On Fri, 4 Sep 2009, Linus Torvalds wrote:
    >
    > I'm sure you already figured the obvious meaning out, but here's a fixed
    > version.

    And here's another patch that may also fix this, simply by virtue of
    writing the "\r\n" as a single string, rather than as two characters. That
    way, we should never get into the situation that th '\r' allocates a new
    buffer (larger than one character), and then the later '\n' writing
    decides that we've filled up.

    Besides, it's a cleanup. An untested one, naturally.

    Linus

    ---
    drivers/char/n_tty.c | 3 +--
    1 files changed, 1 insertions(+), 2 deletions(-)

    diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c
    index 973be2f..4e28b35 100644
    --- a/drivers/char/n_tty.c
    +++ b/drivers/char/n_tty.c
    @@ -300,8 +300,7 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space)
    if (space < 2)
    return -1;
    tty->canon_column = tty->column = 0;
    - tty_put_char(tty, '\r');
    - tty_put_char(tty, c);
    + tty->ops->write(tty, "\r\n", 2);
    return 2;
    }
    tty->canon_column = tty->column;

    \
     
     \ /
      Last update: 2009-10-18 23:28    [W:2.983 / U:0.144 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site