cvs commit: apr/file_io/os2 readwrite.c

[bjh]

bjh         2004/05/21 21:36:40

  Modified:    file_io/os2 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
  1.60      +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.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- readwrite.c       13 Feb 2004 09:38:24 -0000      1.59
  +++ readwrite.c       22 May 2004 04:36:40 -0000      1.60
  @@ -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;
           }