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

Fixes #317

Browse source
This commit is contained in:
Dominik Picheta 2013-01-27 23:58:38 +00:00
commit 0087828e12
1 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

41
lib/pure/osproc.nim
View file

@ -28,6 +28,7 @@ type
id: THandle id: THandle
else: else:
inputHandle, outputHandle, errorHandle: TFileHandle inputHandle, outputHandle, errorHandle: TFileHandle
inStream, outStream, errStream: PStream
id: TPid id: TPid
exitCode: cint exitCode: cint
@ -112,13 +113,22 @@ proc peekExitCode*(p: PProcess): int {.tags: [].}
## return -1 if the process is still running. Otherwise the process' exit code ## return -1 if the process is still running. Otherwise the process' exit code
proc inputStream*(p: PProcess): PStream {.rtl, extern: "nosp$1", tags: [].} proc inputStream*(p: PProcess): PStream {.rtl, extern: "nosp$1", tags: [].}
## opens ``p``'s input stream for writing to ## returns ``p``'s input stream for writing to
##
## **Warning**: The returned `PStream` should not be closed manually as it
## is closed when closing the PProcess ``p``.
proc outputStream*(p: PProcess): PStream {.rtl, extern: "nosp$1", tags: [].} proc outputStream*(p: PProcess): PStream {.rtl, extern: "nosp$1", tags: [].}
## opens ``p``'s output stream for reading from ## returns ``p``'s output stream for reading from
##
## **Warning**: The returned `PStream` should not be closed manually as it
## is closed when closing the PProcess ``p``.
proc errorStream*(p: PProcess): PStream {.rtl, extern: "nosp$1", tags: [].} proc errorStream*(p: PProcess): PStream {.rtl, extern: "nosp$1", tags: [].}
## opens ``p``'s output stream for reading from ## returns ``p``'s output stream for reading from
##
## **Warning**: The returned `PStream` should not be closed manually as it
## is closed when closing the PProcess ``p``.
when defined(macosx) or defined(bsd): when defined(macosx) or defined(bsd):
const const
@ -637,7 +647,20 @@ 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)
close(p.outStream)
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)
@ -679,19 +702,13 @@ elif not defined(useNimRtl):
else: result = p.exitCode.int shr 8 else: result = p.exitCode.int shr 8
proc inputStream(p: PProcess): PStream = proc inputStream(p: PProcess): PStream =
var f: TFile return p.inStream
if not open(f, p.inputHandle, fmWrite): OSError()
result = newFileStream(f)
proc outputStream(p: PProcess): PStream = proc outputStream(p: PProcess): PStream =
var f: TFile return p.outStream
if not open(f, p.outputHandle, fmRead): OSError()
result = newFileStream(f)
proc errorStream(p: PProcess): PStream = proc errorStream(p: PProcess): PStream =
var f: TFile return p.errStream
if not open(f, p.errorHandle, fmRead): OSError()
result = newFileStream(f)
proc csystem(cmd: cstring): cint {.nodecl, importc: "system".} proc csystem(cmd: cstring): cint {.nodecl, importc: "system".}