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

bugfix stderr osproc

Browse source
This commit is contained in:
Araq 2011-05-22 21:23:43 +02:00
commit d8c6e0ed92
1 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/pure/osproc.nim
View file

@ -475,8 +475,7 @@ elif not defined(useNimRtl):
pipe(p_stderr) != 0'i32: pipe(p_stderr) != 0'i32:
OSError("failed to create a pipe") OSError("failed to create a pipe")
var Pid = fork() var Pid = fork()
if Pid < 0: if Pid < 0: OSError("failed to fork process")
OSError("failed to fork process")
if pid == 0: if pid == 0:
## child process: ## child process:
@ -484,15 +483,13 @@ elif not defined(useNimRtl):
if dup2(p_stdin[readIdx], readIdx) < 0: OSError() if dup2(p_stdin[readIdx], readIdx) < 0: OSError()
discard close(p_stdout[readIdx]) discard close(p_stdout[readIdx])
if dup2(p_stdout[writeIdx], writeIdx) < 0: OSError() if dup2(p_stdout[writeIdx], writeIdx) < 0: OSError()
discard close(p_stderr[readIdx])
if poStdErrToStdOut in options: if poStdErrToStdOut in options:
discard close(p_stderr[readIdx])
if dup2(p_stdout[writeIdx], 2) < 0: OSError() if dup2(p_stdout[writeIdx], 2) < 0: OSError()
else: else:
discard close(p_stderr[readIdx])
if dup2(p_stderr[writeIdx], 2) < 0: OSError() if dup2(p_stderr[writeIdx], 2) < 0: OSError()
if workingDir.len > 0: if workingDir.len > 0: os.setCurrentDir(workingDir)
os.setCurrentDir(workingDir)
if poUseShell notin options: if poUseShell notin options:
var a = toCStringArray([extractFilename(command)], args) var a = toCStringArray([extractFilename(command)], args)
if env == nil: if env == nil:
@ -519,7 +516,7 @@ elif not defined(useNimRtl):
result.errorHandle = result.outputHandle result.errorHandle = result.outputHandle
else: else:
result.errorHandle = p_stderr[readIdx] result.errorHandle = p_stderr[readIdx]
discard close(p_stderr[writeIdx]) discard close(p_stderr[writeIdx])
discard close(p_stdin[readIdx]) discard close(p_stdin[readIdx])
discard close(p_stdout[writeIdx]) discard close(p_stdout[writeIdx])