* fhandler.cc (fhandler_base::read): Call get_readahead_into_buffer instead of

duplicating it.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 3b8ad61..c75a91d 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-26  Brian ford  <Brian.Ford@FlightSafety.com>
+
+       * fhandler.cc (fhandler_base::read): Call get_readahead_into_buffer
+       instead of duplicating it.
+
 2006-07-26  Corinna Vinschen  <corinna@vinschen.de>
 
        * shared.cc (offsets): Define as offsets relative to cygwin_hmodule

diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index d33b28d..06bed1b 100644 (file)
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -716,17 +716,7 @@ void
 fhandler_base::read (void *in_ptr, size_t& len)
 {
   char *ptr = (char *) in_ptr;
-  ssize_t copied_chars = 0;
-  int c;
-
-  while (len)
-    if ((c = get_readahead ()) < 0)
-      break;
-    else
-      {
-       ptr[copied_chars++] = (unsigned char) (c & 0xff);
-       len--;
-      }
+  ssize_t copied_chars = get_readahead_into_buffer (ptr, len);
 
   if (copied_chars && is_slow ())
     {
@@ -734,6 +724,7 @@ fhandler_base::read (void *in_ptr, size_t& len)
       goto out;
     }
 
+  len -= copied_chars;
   if (!len)
     {
       len = (size_t) copied_chars;