* syscalls.cc (_read): Clarify debugging output.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 5a756797ee9f39bc12b2500c2792144932d9e2a2..30b7ca08f06d78b7b722d5f35a5462c79102a397 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+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.

diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc
index 2dc5f1776238a4721e48ac6b4d4794f6925e477f..4b2fc3d0738d3189ffeefebbc35c50fc8b183122 100644 (file)
--- 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;