diff options
| -rw-r--r-- | lib/system.nim | 4 | ||||
| -rw-r--r-- | lib/system/sysio.nim | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/lib/system.nim b/lib/system.nim index ee94f85d2..80aedaa8c 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -2594,10 +2594,10 @@ when not defined(JS): #and not defined(nimscript): ## Closes the file. proc endOfFile*(f: File): bool {.tags: [], benign.} - ## Returns true if `f` is at the end. + ## Returns true iff `f` is at the end. proc fileError*(f: File): bool {.tags: [], benign.} - ## Returns true if the error indicator of `f` is set. + ## Returns true iff the error indicator of `f` is set. proc readChar*(f: File): char {. importc: "fgetc", header: "<stdio.h>", tags: [ReadIOEffect].} diff --git a/lib/system/sysio.nim b/lib/system/sysio.nim index 7918569e1..edf3d347a 100644 --- a/lib/system/sysio.nim +++ b/lib/system/sysio.nim @@ -38,7 +38,6 @@ proc fseek(f: File, offset: clong, whence: int): int {. importc: "fseek", header: "<stdio.h>", tags: [].} proc ftell(f: File): int {.importc: "ftell", header: "<stdio.h>", tags: [].} proc ferror(f: File): int {.importc: "ferror", header: "<stdio.h>", tags: [].} -proc feof(f: File): int {.importc: "feof", header: "<stdio.h>", tags: [].} proc setvbuf(stream: File, buf: pointer, typ, size: cint): cint {. importc, header: "<stdio.h>", tags: [].} proc memchr(s: pointer, c: cint, n: csize): pointer {. @@ -153,11 +152,11 @@ proc readAllFile(file: File, len: int): string = let bytes = readBuffer(file, addr(result[0]), len) if endOfFile(file): if bytes < len: - result = substr(result, 0 , bytes - 1) + result.setLen(bytes) elif fileError(file): raiseEIO("error while reading from file") else: - # We red all the bytes but did not reach the EOF + # We read all the bytes but did not reach the EOF # Try to read it as a buffer result = readAllBuffer(file) |