Fixes #3159.
This commit is contained in:
parent
442a682c33
commit
aa01c346f7
1 changed files with 4 additions and 3 deletions
|
|
@ -105,7 +105,8 @@ else:
|
||||||
proc readLineFromStdin*(prompt: string): TaintedString {.
|
proc readLineFromStdin*(prompt: string): TaintedString {.
|
||||||
tags: [ReadIOEffect, WriteIOEffect].} =
|
tags: [ReadIOEffect, WriteIOEffect].} =
|
||||||
var buffer = linenoise.readLine(prompt)
|
var buffer = linenoise.readLine(prompt)
|
||||||
if isNil(buffer): quit(0)
|
if isNil(buffer):
|
||||||
|
raise newException(IOError, "Linenoise returned nil")
|
||||||
result = TaintedString($buffer)
|
result = TaintedString($buffer)
|
||||||
if result.string.len > 0:
|
if result.string.len > 0:
|
||||||
historyAdd(buffer)
|
historyAdd(buffer)
|
||||||
|
|
@ -114,12 +115,12 @@ else:
|
||||||
proc readLineFromStdin*(prompt: string, line: var TaintedString): bool {.
|
proc readLineFromStdin*(prompt: string, line: var TaintedString): bool {.
|
||||||
tags: [ReadIOEffect, WriteIOEffect].} =
|
tags: [ReadIOEffect, WriteIOEffect].} =
|
||||||
var buffer = linenoise.readLine(prompt)
|
var buffer = linenoise.readLine(prompt)
|
||||||
if isNil(buffer): quit(0)
|
if isNil(buffer):
|
||||||
|
raise newException(IOError, "Linenoise returned nil")
|
||||||
line = TaintedString($buffer)
|
line = TaintedString($buffer)
|
||||||
if line.string.len > 0:
|
if line.string.len > 0:
|
||||||
historyAdd(buffer)
|
historyAdd(buffer)
|
||||||
linenoise.free(buffer)
|
linenoise.free(buffer)
|
||||||
# XXX how to determine CTRL+D?
|
|
||||||
result = true
|
result = true
|
||||||
|
|
||||||
proc readPasswordFromStdin*(prompt: string, password: var TaintedString):
|
proc readPasswordFromStdin*(prompt: string, password: var TaintedString):
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue