diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-07-31 04:57:40 +0400 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-07-31 04:57:40 +0400 |
| commit | deaa100baee7f815c2b253534e99c9b455ee8632 (patch) | |
| tree | 14dcd116e6507825f004aa546089d9fc2e995fce /winsup | |
| parent | c91a9a9b5831695aef2068b59f1f2bbfface32c9 (diff) | |
* syscalls.cc (_read): Clarify debugging output.
Diffstat (limited to 'winsup')
| -rw-r--r-- | winsup/cygwin/ChangeLog | 4 | ||||
| -rw-r--r-- | winsup/cygwin/syscalls.cc | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 5a756797e..30b7ca08f 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,9 @@ 2002-07-30 Christopher Faylor <cgf@redhat.com> + * syscalls.cc (_read): Clarify debugging output. + +2002-07-30 Christopher Faylor <cgf@redhat.com> + * fhandler.h (fhandler_base::get_r_no_interrupt): Make virtual. 2002-07-30 Christopher Faylor <cgf@redhat.com> diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 2dc5f1776..4b2fc3d07 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -305,10 +305,11 @@ _read (int fd, void *ptr, size_t len) DWORD wait = cfd->is_nonblocking () ? 0 : INFINITE; /* Could block, so let user know we at least got here. */ - syscall_printf ("read (%d, %p, %d) %sblocking, sigcatchers %d", fd, ptr, len, wait ? "" : "non", sigcatchers); + syscall_printf ("read (%d, %p, %d) %sblocking, sigcatchers %d", + fd, ptr, len, wait ? "" : "non", sigcatchers); if (wait && (!cfd->is_slow () || cfd->get_r_no_interrupt ())) - debug_printf ("non-interruptible read\n"); + debug_printf ("no need to call ready_for_read\n"); else if (!cfd->ready_for_read (fd, wait)) { res = -1; @@ -318,7 +319,7 @@ _read (int fd, void *ptr, size_t len) /* FIXME: This is not thread safe. We need some method to ensure that an fd, closed in another thread, aborts I/O operations. */ - if (!cfd.isopen()) + if (!cfd.isopen ()) return -1; /* Check to see if this is a background read from a "tty", @@ -331,7 +332,7 @@ _read (int fd, void *ptr, size_t len) if (res > bg_eof) { myself->process_state |= PID_TTYIN; - if (!cfd.isopen()) + if (!cfd.isopen ()) return -1; res = cfd->read (ptr, len); myself->process_state &= ~PID_TTYIN; |