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

Fixed osproc.execCmdEx; tester should now succeed.

Browse source
This commit is contained in:
Dominik Picheta 2013-01-28 00:32:36 +00:00
commit d9d98512e0
1 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

31
lib/pure/osproc.nim
View file

@ -242,7 +242,6 @@ when not defined(useNimRtl):
result.string.add(line.string) result.string.add(line.string)
result.string.add("\n") result.string.add("\n")
elif not running(p): break elif not running(p): break
close(outp)
close(p) close(p)
@ -647,20 +646,10 @@ elif not defined(useNimRtl):
discard close(p_stdin[readIdx]) discard close(p_stdin[readIdx])
discard close(p_stdout[writeIdx]) discard close(p_stdout[writeIdx])
proc createStream(stream: var PStream, handle: var TFileHandle,
fileMode: TFileMode) =
var f: TFile
if not open(f, handle, fileMode): OSError()
stream = newFileStream(f)
createStream(result.inStream, result.inputHandle, fmWrite)
createStream(result.outStream, result.outputHandle, fmRead)
createStream(result.errStream, result.errorHandle, fmRead)
proc close(p: PProcess) = proc close(p: PProcess) =
close(p.inStream) if p.inStream != nil: close(p.inStream)
close(p.outStream) if p.outStream != nil: close(p.outStream)
close(p.errStream) if p.errStream != nil: close(p.errStream)
discard close(p.inputHandle) discard close(p.inputHandle)
discard close(p.outputHandle) discard close(p.outputHandle)
discard close(p.errorHandle) discard close(p.errorHandle)
@ -701,13 +690,25 @@ elif not defined(useNimRtl):
if p.exitCode == -3: result = -1 if p.exitCode == -3: result = -1
else: result = p.exitCode.int shr 8 else: result = p.exitCode.int shr 8
proc createStream(stream: var PStream, handle: var TFileHandle,
fileMode: TFileMode) =
var f: TFile
if not open(f, handle, fileMode): OSError()
stream = newFileStream(f)
proc inputStream(p: PProcess): PStream = proc inputStream(p: PProcess): PStream =
if p.inStream == nil:
createStream(p.inStream, p.inputHandle, fmWrite)
return p.inStream return p.inStream
proc outputStream(p: PProcess): PStream = proc outputStream(p: PProcess): PStream =
if p.outStream == nil:
createStream(p.outStream, p.outputHandle, fmRead)
return p.outStream return p.outStream
proc errorStream(p: PProcess): PStream = proc errorStream(p: PProcess): PStream =
if p.errStream == nil:
createStream(p.errStream, p.errorHandle, fmRead)
return p.errStream return p.errStream
proc csystem(cmd: cstring): cint {.nodecl, importc: "system".} proc csystem(cmd: cstring): cint {.nodecl, importc: "system".}
@ -766,10 +767,8 @@ proc execCmdEx*(command: string, options: set[TProcessOption] = {
else: else:
result[1] = peekExitCode(p) result[1] = peekExitCode(p)
if result[1] != -1: break if result[1] != -1: break
close(outp)
close(p) close(p)
when isMainModule: when isMainModule:
var x = execProcess("gcc -v") var x = execProcess("gcc -v")
echo "ECHO ", x echo "ECHO ", x