From 5213ca6f1c0696bcf6f719e424167525ae319b99 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Wed, 31 Jul 2013 15:19:18 +0000 Subject: [PATCH] * fhandler_tty.cc: Revert accidental checkin. * update-copyright: Ditto. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/fhandler_tty.cc | 5 +---- winsup/cygwin/update-copyright | 4 ++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 273861a58..f7a365514 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2013-07-31 Christopher Faylor + + * fhandler_tty.cc: Revert accidental checkin. + * update-copyright: Ditto. + 2013-07-31 Christopher Faylor * cygheap.cc (cmalloc): Use size_t for size field. 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); diff --git a/winsup/cygwin/update-copyright b/winsup/cygwin/update-copyright index 3677c6156..ad5eb2310 100755 --- a/winsup/cygwin/update-copyright +++ b/winsup/cygwin/update-copyright @@ -54,10 +54,10 @@ sub update_maybe($%) { while (<>) { if ($copyright) { push @file, $_; - } elsif (/^(?:dnl\s|.*"|[#\s]*)Copyright/o) { + } elsif (/^(?:dnl\s|[#\s]*)Copyright/o) { $copyright = $_; $copyright .= scalar <> while $copyright =~ /,\s*$/o; - if ($copyright !~ /Red Hat, Inc\.(?: 1996\s*-\s*.*)?\n/so) { + if ($copyright !~ /Red Hat, Inc\.\n/o) { push @file, $copyright; next; }