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

Improve readLine to work with strings containing \0 again.

Browse source 
This decreases performance slightly.
This commit is contained in:
def 2015-07-25 20:25:58 +02:00
commit a9b299b4ed
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lib/system/sysio.nim
View file

@ -39,6 +39,10 @@ proc fseek(f: File, offset: clong, whence: int): int {.
proc ftell(f: File): int {.importc: "ftell", header: "<stdio.h>", tags: [].} proc ftell(f: File): int {.importc: "ftell", header: "<stdio.h>", tags: [].}
proc setvbuf(stream: File, buf: pointer, typ, size: cint): cint {. proc setvbuf(stream: File, buf: pointer, typ, size: cint): cint {.
importc, header: "<stdio.h>", tags: [].} importc, header: "<stdio.h>", tags: [].}
proc memchr(s: pointer, c: cint, n: csize): pointer {.
importc: "memchr", header: "<string.h>", tags: [].}
proc memset(s: pointer, c: cint, n: csize) {.
header: "<string.h>", importc: "memset", tags: [].}
{.push stackTrace:off, profiler:off.} {.push stackTrace:off, profiler:off.}
proc write(f: File, c: cstring) = fputs(c, f) proc write(f: File, c: cstring) = fputs(c, f)
@ -70,21 +74,27 @@ proc readLine(f: File, line: var TaintedString): bool =
var pos = 0 var pos = 0
# Use the currently reserved space for a first try # Use the currently reserved space for a first try
var space = cast[PGenericSeq](line.string).space var space = cast[PGenericSeq](line.string).space
line.string.setLen(space)
while true: while true:
# memset to \l so that we can tell how far fgets wrote, even on EOF, where
# fgets doesn't append an \l
memset(addr line.string[pos], '\l'.ord, space)
if fgets(addr line.string[pos], space, f) == nil: if fgets(addr line.string[pos], space, f) == nil:
line.string.setLen(0) line.string.setLen(0)
return false return false
# This will cut the string short when it contains \0 let m = memchr(addr line.string[pos], '\l'.ord, space)
let last = pos + cstring(addr line.string[pos]).len-1 if m != nil:
if line.string[last] == '\l': # \l found: Could be our own or the one by fgets, in any case, we're done
let last = cast[ByteAddress](m) - cast[ByteAddress](addr line.string[0])
if last > 0 and line.string[last-1] == '\c': if last > 0 and line.string[last-1] == '\c':
line.string.setLen(last-1) line.string.setLen(last-1)
return true return true
line.string.setLen(last) line.string.setLen(last)
return true return true
pos = last+1 # No \l found: Increase buffer and read more
space = 128 # Read in 128 bytes at a time inc pos, space
space = 128 # read in 128 bytes at a time
line.string.setLen(pos+space) line.string.setLen(pos+space)
proc readLine(f: File): TaintedString = proc readLine(f: File): TaintedString =