summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/fhandler_tty.cc
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2013-07-31 15:19:18 +0000
committerChristopher Faylor <me@cgf.cx>2013-07-31 15:19:18 +0000
commit5213ca6f1c0696bcf6f719e424167525ae319b99 (patch)
treeca778f465e501b17fdb6d2d1e5e98e5cb33dcf4d /winsup/cygwin/fhandler_tty.cc
parent24557e9caaf23db2a642c7637f3c0df7c8bc9106 (diff)
downloadcygnal-5213ca6f1c0696bcf6f719e424167525ae319b99.tar.gz
cygnal-5213ca6f1c0696bcf6f719e424167525ae319b99.tar.bz2
cygnal-5213ca6f1c0696bcf6f719e424167525ae319b99.zip
* fhandler_tty.cc: Revert accidental checkin.
* update-copyright: Ditto.
Diffstat (limited to 'winsup/cygwin/fhandler_tty.cc')
-rw-r--r--winsup/cygwin/fhandler_tty.cc5
1 files changed, 1 insertions, 4 deletions
diff --git a/winsup/cygwin/fhandler_tty.cc b/winsup/cygwin/fhandler_tty.cc
index 5efbf4328..34c879503 100644
--- a/winsup/cygwin/fhandler_tty.cc
+++ b/winsup/cygwin/fhandler_tty.cc
@@ -96,7 +96,7 @@ fhandler_pty_common::__acquire_output_mutex (const char *fn, int ln,
{
if (strace.active ())
strace.prntf (_STRACE_TERMIOS, fn, "(%d): pty output_mutex (%p): waiting %d ms", ln, output_mutex, ms);
- if (0 && ms == INFINITE)
+ if (ms == INFINITE)
ms = 100;
DWORD res = WaitForSingleObject (output_mutex, ms);
if (res == WAIT_OBJECT_0)
@@ -145,9 +145,6 @@ fhandler_pty_common::__release_output_mutex (const char *fn, int ln)
void
fhandler_pty_master::doecho (const void *str, DWORD len)
{
- static char buf[128 * 1024];
- int buflen = process_slave_output (buf, sizeof (buf), false);
- puts_readahead (buf, buflen);
acquire_output_mutex (INFINITE);
if (!WriteFile (to_master, str, len, &len, NULL))
termios_printf ("Write to %p failed, %E", to_master);