jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5023 from nigredo-tori/fix-5022

Browse source 
Fix asyncfile in Windows Server 2003
This commit is contained in:
Dominik Picheta 2016-11-14 18:45:48 +01:00 • committed by GitHub
commit 52f20abf22
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
lib/pure/asyncfile.nim
View file

@ -118,8 +118,8 @@ proc readBuffer*(f: AsyncFile, buf: pointer, size: int): Future[int] =
## Read ``size`` bytes from the specified file asynchronously starting at ## Read ``size`` bytes from the specified file asynchronously starting at
## the current position of the file pointer. ## the current position of the file pointer.
## ##
## If the file pointer is past the end of the file then an empty string is ## If the file pointer is past the end of the file then zero is returned
## returned. ## and no bytes are read into ``buf``
var retFuture = newFuture[int]("asyncfile.readBuffer") var retFuture = newFuture[int]("asyncfile.readBuffer")
when defined(windows) or defined(nimdoc): when defined(windows) or defined(nimdoc):
@ -149,7 +149,11 @@ proc readBuffer*(f: AsyncFile, buf: pointer, size: int): Future[int] =
let err = osLastError() let err = osLastError()
if err.int32 != ERROR_IO_PENDING: if err.int32 != ERROR_IO_PENDING:
GC_unref(ol) GC_unref(ol)
retFuture.fail(newException(OSError, osErrorMsg(err))) if err.int32 == ERROR_HANDLE_EOF:
# This happens in Windows Server 2003
retFuture.complete(0)
else:
retFuture.fail(newException(OSError, osErrorMsg(err)))
else: else:
# Request completed immediately. # Request completed immediately.
var bytesRead: DWord var bytesRead: DWord
@ -233,7 +237,12 @@ proc read*(f: AsyncFile, size: int): Future[string] =
dealloc buffer dealloc buffer
buffer = nil buffer = nil
GC_unref(ol) GC_unref(ol)
retFuture.fail(newException(OSError, osErrorMsg(err)))
if err.int32 == ERROR_HANDLE_EOF:
# This happens in Windows Server 2003
retFuture.complete("")
else:
retFuture.fail(newException(OSError, osErrorMsg(err)))
else: else:
# Request completed immediately. # Request completed immediately.
var bytesRead: DWord var bytesRead: DWord