stoddard 2004/07/19 08:29:27
Modified: . Tag: APR_0_9_BRANCH CHANGES
file_io/win32 Tag: APR_0_9_BRANCH seek.c
Log:
Win32: Fix bug in tracking the file pointer in files opened for
overlapped/xthread io
Revision Changes Path
No revision
No revision
1.426.2.27 +2 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.426.2.26
retrieving revision 1.426.2.27
diff -u -r1.426.2.26 -r1.426.2.27
--- CHANGES 13 Jul 2004 09:22:40 -0000 1.426.2.26
+++ CHANGES 19 Jul 2004 15:29:27 -0000 1.426.2.27
@@ -1,4 +1,6 @@
Changes with APR 0.9.5
+ *) Win32: Fix bug tracking the file pointer on a file opened for
+ overlapped/APR_XTHREAD io. [Bill Stoddard]
*) Fix FreeBSD atomics. [Paul Querna <chip force-elite.com>]
No revision
No revision
1.27.2.3 +4 -1 apr/file_io/win32/seek.c
Index: seek.c
===================================================================
RCS file: /home/cvs/apr/file_io/win32/seek.c,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -u -r1.27.2.2 -r1.27.2.3
--- seek.c 4 May 2004 00:46:03 -0000 1.27.2.2
+++ seek.c 19 Jul 2004 15:29:27 -0000 1.27.2.3
@@ -83,7 +83,10 @@
*offset = thefile->filePtr - thefile->dataRead + thefile->bufpos;
return rc;
}
- else if (thefile->pOverlapped) {
+ /* A file opened with APR_XTHREAD has been opened for overlapped i/o.
+ * APR must explicitly track the file pointer in this case.
+ */
+ else if (thefile->pOverlapped || thefile->flags & APR_XTHREAD) {
switch(where) {
case APR_SET:
thefile->filePtr = *offset;
