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

fixes bootstrapping problem

Browse source
This commit is contained in:
Araq 2016-10-21 18:02:57 +02:00
commit 7c22c03876
1 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/system/sysio.nim
View file

@ -104,22 +104,22 @@ proc getFileHandle*(f: File): FileHandle = c_fileno(f)
proc readLine(f: File, line: var TaintedString): bool = proc readLine(f: File, line: var TaintedString): bool =
var pos = 0 var pos = 0
var space: cint = 80 var sp: cint = 80
# Use the currently reserved space for a first try # Use the currently reserved space for a first try
if line.string.isNil: if line.string.isNil:
line = TaintedString(newStringOfCap(80)) line = TaintedString(newStringOfCap(80))
else: else:
when not defined(nimscript): when not defined(nimscript):
space = cint(cast[PGenericSeq](line.string).space) sp = cint(cast[PGenericSeq](line.string).space)
line.string.setLen(space) line.string.setLen(sp)
while true: while true:
# memset to \l so that we can tell how far fgets wrote, even on EOF, where # memset to \l so that we can tell how far fgets wrote, even on EOF, where
# fgets doesn't append an \l # fgets doesn't append an \l
c_memset(addr line.string[pos], '\l'.ord, space) c_memset(addr line.string[pos], '\l'.ord, sp)
if c_fgets(addr line.string[pos], space, f) == nil: if c_fgets(addr line.string[pos], sp, f) == nil:
line.string.setLen(0) line.string.setLen(0)
return false return false
let m = c_memchr(addr line.string[pos], '\l'.ord, space) let m = c_memchr(addr line.string[pos], '\l'.ord, sp)
if m != nil: if m != nil:
# \l found: Could be our own or the one by fgets, in any case, we're done # \l found: Could be our own or the one by fgets, in any case, we're done
var last = cast[ByteAddress](m) - cast[ByteAddress](addr line.string[0]) var last = cast[ByteAddress](m) - cast[ByteAddress](addr line.string[0])
@ -130,17 +130,17 @@ proc readLine(f: File, line: var TaintedString): bool =
# \0\l\0 => line ending in a null character. # \0\l\0 => line ending in a null character.
# \0\l\l => last line without newline, null was put there by fgets. # \0\l\l => last line without newline, null was put there by fgets.
elif last > 0 and line.string[last-1] == '\0': elif last > 0 and line.string[last-1] == '\0':
if last < pos + space - 1 and line.string[last+1] != '\0': if last < pos + sp - 1 and line.string[last+1] != '\0':
dec last dec last
line.string.setLen(last) line.string.setLen(last)
return true return true
else: else:
# fgets will have inserted a null byte at the end of the string. # fgets will have inserted a null byte at the end of the string.
dec space dec sp
# No \l found: Increase buffer and read more # No \l found: Increase buffer and read more
inc pos, space inc pos, sp
space = 128 # read in 128 bytes at a time sp = 128 # read in 128 bytes at a time
line.string.setLen(pos+space) line.string.setLen(pos+sp)
proc readLine(f: File): TaintedString = proc readLine(f: File): TaintedString =
result = TaintedString(newStringOfCap(80)) result = TaintedString(newStringOfCap(80))