From 03c48ee2e0ee6100f9156fb33bccc38207f7727e Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 10 Nov 2009 20:02:20 +0000 Subject: [PATCH] * fhandler_console.cc (fhandler_console::read): Revert change from 2009-11-09. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_console.cc | 27 +++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 96597cfd1..cdf728026 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2009-11-10 Corinna Vinschen + + * fhandler_console.cc (fhandler_console::read): Revert change from + 2009-11-09. + 2009-11-10 Corinna Vinschen * fhandler_disk_file.cc (is_volume_mountpoint): Align check with diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc index 8bfccde0b..632ec1dcb 100644 --- a/winsup/cygwin/fhandler_console.cc +++ b/winsup/cygwin/fhandler_console.cc @@ -379,23 +379,18 @@ fhandler_console::read (void *pv, size_t& buflen) else toadd = tmp + 1; } - else if (nread == 1) + else if (dev_state->metabit) { - /* META handling is restricted to singlebyte (ASCII) - character values. */ - if (dev_state->metabit) - { - tmp[1] |= 0x80; - toadd = tmp + 1; - } - else - { - tmp[0] = '\033'; - tmp[1] = cyg_tolower (tmp[1]); - toadd = tmp; - nread++; - dev_state->nModifiers &= ~4; - } + tmp[1] |= 0x80; + toadd = tmp + 1; + } + else + { + tmp[0] = '\033'; + tmp[1] = cyg_tolower (tmp[1]); + toadd = tmp; + nread++; + dev_state->nModifiers &= ~4; } } #undef ich