From 7a358447139b95c8070d9a768003479fd9133e97 Mon Sep 17 00:00:00 2001 From: Joe Peterson Date: Fri, 2 Jan 2009 13:43:25 +0000 Subject: [PATCH] --- yaml --- r: 125039 b: refs/heads/master c: a59c0d6f14315a3f300f6f3786137213727e4c47 h: refs/heads/master i: 125037: fbe14aff2be0522c25f5fdc662fc902462637b2f 125035: 4bf92e9a1f18ff47f4895e655f02eb0c802059a4 125031: f99585b72a17623360fd60c490d0fcf61ca6c55c 125023: 88c056faff098bd9e8363623f0ca5f3f4ebdf73a v: v3 --- [refs] | 2 +- trunk/drivers/char/n_tty.c | 24 +++++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 67a5973478b8..4b686a492e76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fc6f6238226e6d1248e1967eae2bf556eaf3ac17 +refs/heads/master: a59c0d6f14315a3f300f6f3786137213727e4c47 diff --git a/trunk/drivers/char/n_tty.c b/trunk/drivers/char/n_tty.c index a223823544bf..30b0426b3788 100644 --- a/trunk/drivers/char/n_tty.c +++ b/trunk/drivers/char/n_tty.c @@ -351,10 +351,12 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space) tty->column--; break; default: - if (O_OLCUC(tty)) - c = toupper(c); - if (!iscntrl(c) && !is_continuation(c, tty)) - tty->column++; + if (!iscntrl(c)) { + if (O_OLCUC(tty)) + c = toupper(c); + if (!is_continuation(c, tty)) + tty->column++; + } break; } @@ -425,7 +427,9 @@ static ssize_t process_output_block(struct tty_struct *tty, nr = space; for (i = 0, cp = buf; i < nr; i++, cp++) { - switch (*cp) { + unsigned char c = *cp; + + switch (c) { case '\n': if (O_ONLRET(tty)) tty->column = 0; @@ -447,10 +451,12 @@ static ssize_t process_output_block(struct tty_struct *tty, tty->column--; break; default: - if (O_OLCUC(tty)) - goto break_out; - if (!iscntrl(*cp)) - tty->column++; + if (!iscntrl(c)) { + if (O_OLCUC(tty)) + goto break_out; + if (!is_continuation(c, tty)) + tty->column++; + } break; } }