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

Fixes #7877

Browse source
This commit is contained in:
data-man 2018-05-25 06:50:39 +03:00
commit 605b65487f
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
lib/pure/streams.nim
View file

@ -88,16 +88,18 @@ proc readData*(s: Stream, buffer: pointer, bufLen: int): int =
proc readAll*(s: Stream): string = proc readAll*(s: Stream): string =
## Reads all available data. ## Reads all available data.
const bufferSize = 1000 const bufferSize = 1024
result = newString(bufferSize) result = newString(bufferSize)
var r = 0 var buffer {.noinit.}: array[bufferSize, char]
while true: while true:
let readBytes = readData(s, addr(result[r]), bufferSize) let readBytes = readData(s, addr(buffer[0]), bufferSize)
if readBytes < bufferSize: if readBytes == 0:
setLen(result, r+readBytes) break
let prevLen = result.len
result.setLen(prevLen + readBytes)
copyMem(addr(result[prevLen]), addr(buffer[0]), readBytes)
if readBytes < bufferSize:
break break
inc r, bufferSize
setLen(result, r+bufferSize)
proc peekData*(s: Stream, buffer: pointer, bufLen: int): int = proc peekData*(s: Stream, buffer: pointer, bufLen: int): int =
## low level proc that reads data into an untyped `buffer` of `bufLen` size ## low level proc that reads data into an untyped `buffer` of `bufLen` size