libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

* fhandler_tty.cc: Revert accidental checkin. 

* update-copyright: Ditto.
This commit is contained in:
Christopher Faylor 2013-07-31 15:19:18 +00:00
parent 24557e9caa
commit 5213ca6f1c
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2013-07-31 Christopher Faylor <me.cygwin2013@cgf.cx>
* fhandler_tty.cc: Revert accidental checkin.
* update-copyright: Ditto.
2013-07-31 Christopher Faylor <me.cygwin2013@cgf.cx> 2013-07-31 Christopher Faylor <me.cygwin2013@cgf.cx>
* cygheap.cc (cmalloc): Use size_t for size field. * cygheap.cc (cmalloc): Use size_t for size field.

5
winsup/cygwin/fhandler_tty.cc
View File

@ -96,7 +96,7 @@ fhandler_pty_common::__acquire_output_mutex (const char *fn, int ln,
{ {
if (strace.active ()) if (strace.active ())
strace.prntf (_STRACE_TERMIOS, fn, "(%d): pty output_mutex (%p): waiting %d ms", ln, output_mutex, ms); 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; ms = 100;
DWORD res = WaitForSingleObject (output_mutex, ms); DWORD res = WaitForSingleObject (output_mutex, ms);
if (res == WAIT_OBJECT_0) if (res == WAIT_OBJECT_0)
@ -145,9 +145,6 @@ fhandler_pty_common::__release_output_mutex (const char *fn, int ln)
void void
fhandler_pty_master::doecho (const void *str, DWORD len) 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); acquire_output_mutex (INFINITE);
if (!WriteFile (to_master, str, len, &len, NULL)) if (!WriteFile (to_master, str, len, &len, NULL))
termios_printf ("Write to %p failed, %E", to_master); termios_printf ("Write to %p failed, %E", to_master);

4
winsup/cygwin/update-copyright
View File

@ -54,10 +54,10 @@ sub update_maybe($%) {
while (<>) { while (<>) {
if ($copyright) { if ($copyright) {
push @file, $_; push @file, $_;
} elsif (/^(?:dnl\s|.*"|[#\s]*)Copyright/o) { } elsif (/^(?:dnl\s|[#\s]*)Copyright/o) {
$copyright = $_; $copyright = $_;
$copyright .= scalar <> while $copyright =~ /,\s*$/o; $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; push @file, $copyright;
next; next;
} }