* fhandler_console.cc (fhandler_console::read): Revert change from

	2009-11-09.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 96597cf..cdf7280 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
 2009-11-10  Corinna Vinschen  <corinna@vinschen.de>
 
+       * fhandler_console.cc (fhandler_console::read): Revert change from
+       2009-11-09.
+
+2009-11-10  Corinna Vinschen  <corinna@vinschen.de>
+
        * fhandler_disk_file.cc (is_volume_mountpoint): Align check with
        symlink_info::check_reparse_point().
        * path.cc (symlink_info::check_reparse_point): Rearrange slightly.

diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index 8bfccde..632ec1d 100644 (file)
--- 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