bjh 2004/05/22 00:04:34
Modified: file_io/os2 Tag: APR_0_9_BRANCH readwrite.c
Log:
OS/2: Fix incorrect return of APR_EOF when a 0 length read is requested
Found while porting subversion.
Revision Changes Path
No revision
No revision
1.58.2.2 +1 -1 apr/file_io/os2/readwrite.c
Index: readwrite.c
===================================================================
RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
retrieving revision 1.58.2.1
retrieving revision 1.58.2.2
diff -u -r1.58.2.1 -r1.58.2.2
--- readwrite.c 13 Feb 2004 09:33:42 -0000 1.58.2.1
+++ readwrite.c 22 May 2004 07:04:34 -0000 1.58.2.2
@@ -74,7 +74,7 @@
*nbytes = rc == 0 ? pos - (char *)buf : 0;
apr_thread_mutex_unlock(thefile->mutex);
- if (*nbytes == 0 && rc == 0) {
+ if (*nbytes == 0 && rc == 0 && thefile->eof_hit) {
return APR_EOF;
}