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

Merge pull request #957 from zielmicha/macosx-fix

Browse source 
osproc: MacOSX workaround for lack of execvpe
This commit is contained in:
Andreas Rumpf 2014-02-24 20:28:57 +01:00
commit 1024e7a3db
1 changed files with 11 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lib/pure/osproc.nim
View file

@ -747,7 +747,7 @@ elif not defined(useNimRtl):
var pid: TPid var pid: TPid
var dataCopy = data var dataCopy = data
if defined(useClone): when defined(useClone):
const stackSize = 65536 const stackSize = 65536
let stackEnd = cast[clong](alloc(stackSize)) let stackEnd = cast[clong](alloc(stackSize))
let stack = cast[pointer](stackEnd + stackSize) let stack = cast[pointer](stackEnd + stackSize)
@ -779,6 +779,9 @@ elif not defined(useNimRtl):
discard write(data.pErrorPipe[writeIdx], addr error, sizeof(error)) discard write(data.pErrorPipe[writeIdx], addr error, sizeof(error))
exitnow(1) exitnow(1)
when defined(macosx):
var environ {.importc.}: cstringArray
proc startProcessAfterFork(data: ptr TStartProcessData) = proc startProcessAfterFork(data: ptr TStartProcessData) =
# Warning: no GC here! # Warning: no GC here!
# Or anythink that touches global structures - all called nimrod procs # Or anythink that touches global structures - all called nimrod procs
@ -806,7 +809,13 @@ elif not defined(useNimRtl):
discard fcntl(data.pErrorPipe[writeIdx], F_SETFD, FD_CLOEXEC) discard fcntl(data.pErrorPipe[writeIdx], F_SETFD, FD_CLOEXEC)
if data.optionPoUsePath: if data.optionPoUsePath:
discard execvpe(data.sysCommand, data.sysArgs, data.sysEnv) when defined(macosx):
# MacOSX doesn't have execvpe, so we need workaround.
# On MacOSX we can arrive here only from fork, so this is safe:
environ = data.sysEnv
discard execvp(data.sysCommand, data.sysArgs)
else:
discard execvpe(data.sysCommand, data.sysArgs, data.sysEnv)
else: else:
discard execve(data.sysCommand, data.sysArgs, data.sysEnv) discard execve(data.sysCommand, data.sysArgs, data.sysEnv)