svn commit: r355790 - in /apr/apr/trunk: CHANGES file_io/win32/readwrite.c

[ro...@apache.org]

Author: rooneg
Date: Sat Dec 10 14:22:12 2005
New Revision: 355790

URL: http://svn.apache.org/viewcvs?rev=355790&view=rev
Log:
Fix handling of EOF for unbuffered reads on win32.

* file_io/win32/readwrite.c
  (apr_file_read): In the unbuffered case, set thefile->eof_true if we
   hit EOF.

* CHANGES: note Change.

Submitted by: Konstantin Sharenkov <Konstantin.Sharenkov at enterra-inc.com>
Reviewed by: wrowe, rooneg

Modified:
    apr/apr/trunk/CHANGES
    apr/apr/trunk/file_io/win32/readwrite.c

Modified: apr/apr/trunk/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/CHANGES?rev=355790&r1=355789&r2=355790&view=diff
==============================================================================
--- apr/apr/trunk/CHANGES (original)
+++ apr/apr/trunk/CHANGES Sat Dec 10 14:22:12 2005
@@ -2,7 +2,10 @@
 
   *) Only include uuid/uuid.h if we haven't already included uuid.h, since
      doing so can result in type conflicts.
-     [Craig Rodrigues <rodrigc at crodrigues.org>]
+     [Craig Rodrigues <rodrigc crodrigues.org>]
+
+  *) Fix EOF handling for unbuffered reads on win32.
+     [Konstantin Sharenkov <Konstantin.Sharenkov enterra-inc.com>]
 
 Changes for APR 1.3.0
 

Modified: apr/apr/trunk/file_io/win32/readwrite.c
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/file_io/win32/readwrite.c?rev=355790&r1=355789&r2=355790&view=diff
==============================================================================
--- apr/apr/trunk/file_io/win32/readwrite.c (original)
+++ apr/apr/trunk/file_io/win32/readwrite.c Sat Dec 10 14:22:12 2005
@@ -206,6 +206,8 @@
         /* Unbuffered i/o */
         apr_size_t nbytes;
         rv = read_with_timeout(thefile, buf, *len, &nbytes);
+        if (rv == APR_EOF)
+            thefile->eof_hit = TRUE;
         *len = nbytes;
     }