diff options
| author | awr1 <41453959+awr1@users.noreply.github.com> | 2018-09-04 16:33:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-04 16:33:52 -0500 |
| commit | eb668003bf35671d7358e5f54e05820c0f4aef3d (patch) | |
| tree | e5c5d6315f8ba4a5dd647bf67a4d0afb609916e7 /lib/pure/osproc.nim | |
| parent | 89ad1cc9b18db8320e5b170ee45888cf79d52001 (diff) | |
| parent | 4aba2981dd47672744191bd17b39bb149f494637 (diff) | |
| download | Nim-eb668003bf35671d7358e5f54e05820c0f4aef3d.tar.gz | |
Merge branch 'devel' into experimentalize-reorder
Diffstat (limited to 'lib/pure/osproc.nim')
| -rw-r--r-- | lib/pure/osproc.nim | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/pure/osproc.nim b/lib/pure/osproc.nim index f86acfc49..faeb01407 100644 --- a/lib/pure/osproc.nim +++ b/lib/pure/osproc.nim @@ -884,9 +884,11 @@ elif not defined(useNimRtl): chck posix_spawn_file_actions_adddup2(fops, data.pStdin[readIdx], readIdx) chck posix_spawn_file_actions_addclose(fops, data.pStdout[readIdx]) chck posix_spawn_file_actions_adddup2(fops, data.pStdout[writeIdx], writeIdx) - if (poStdErrToStdOut in data.options): - chck posix_spawn_file_actions_addclose(fops, data.pStderr[readIdx]) + chck posix_spawn_file_actions_addclose(fops, data.pStderr[readIdx]) + if poStdErrToStdOut in data.options: chck posix_spawn_file_actions_adddup2(fops, data.pStdout[writeIdx], 2) + else: + chck posix_spawn_file_actions_adddup2(fops, data.pStderr[writeIdx], 2) var res: cint if data.workingDir.len > 0: |