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

osproc: fix naming inconsistiences

Browse source
This commit is contained in:
Michał Zieliński 2014-01-26 22:30:20 +01:00
commit 11053afff8
1 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

42
lib/pure/osproc.nim
View file

@ -13,7 +13,7 @@
include "system/inclrtl" include "system/inclrtl"
import import
strutils, os, strtabs, streams, sequtils strutils, os, strtabs, streams
when defined(windows): when defined(windows):
import winlean import winlean
@ -44,7 +44,7 @@ type
poStdErrToStdOut, ## merge stdout and stderr to the stdout stream poStdErrToStdOut, ## merge stdout and stderr to the stdout stream
poParentStreams ## use the parent's streams poParentStreams ## use the parent's streams
template poUseShell*: TProcessOption {.deprecated.} = poUsePath const poUseShell* {.deprecated.} = poUsePath
## Deprecated alias for poUsePath. ## Deprecated alias for poUsePath.
proc quoteShellWindows*(s: string): string {.noSideEffect, rtl, extern: "nosp$1".} = proc quoteShellWindows*(s: string): string {.noSideEffect, rtl, extern: "nosp$1".} =
@ -604,20 +604,20 @@ elif not defined(useNimRtl):
pipe(pStderr) != 0'i32: pipe(pStderr) != 0'i32:
osError(osLastError()) osError(osLastError())
var sys_command: string var sysCommand: string
var sys_args_raw: seq[string] var sysArgsRaw: seq[string]
if poEvalCommand in options: if poEvalCommand in options:
sys_command = "/bin/sh" sysCommand = "/bin/sh"
sys_args_raw = @[sys_command, "-c", command] sysArgsRaw = @[sysCommand, "-c", command]
assert args.len == 0 assert args.len == 0
else: else:
sys_command = command sysCommand = command
sys_args_raw = @[command] sysArgsRaw = @[command]
for arg in args.items: for arg in args.items:
sys_args_raw.add arg sysArgsRaw.add arg
var sys_args = allocCStringArray(sys_args_raw) var sysArgs = allocCStringArray(sysArgsRaw)
finally: deallocCStringArray(sys_args) finally: deallocCStringArray(sysArgs)
var pid: TPid var pid: TPid
when defined(posix_spawn) and not defined(useFork): when defined(posix_spawn) and not defined(useFork):
@ -650,15 +650,15 @@ elif not defined(useNimRtl):
else: else:
chck posix_spawn_file_actions_adddup2(fops, p_stderr[writeIdx], 2) chck posix_spawn_file_actions_adddup2(fops, p_stderr[writeIdx], 2)
var sys_env = if env == nil: envToCStringArray() else: envToCStringArray(env) var sysEnv = if env == nil: envToCStringArray() else: envToCStringArray(env)
var res: cint var res: cint
# This is incorrect! # FIXME: chdir is global to process
if workingDir.len > 0: os.setCurrentDir(workingDir) if workingDir.len > 0: os.setCurrentDir(workingDir)
if poUsePath in options: if poUsePath in options:
res = posix_spawnp(pid, sys_command, fops, attr, sys_args, sys_env) res = posix_spawnp(pid, sysCommand, fops, attr, sysArgs, sysEnv)
else: else:
res = posix_spawn(pid, sys_command, fops, attr, sys_args, sys_env) res = posix_spawn(pid, sysCommand, fops, attr, sysArgs, sysEnv)
deallocCStringArray(sys_env) deallocCStringArray(sysEnv)
discard posix_spawn_file_actions_destroy(fops) discard posix_spawn_file_actions_destroy(fops)
discard posix_spawnattr_destroy(attr) discard posix_spawnattr_destroy(attr)
chck res chck res
@ -687,15 +687,15 @@ elif not defined(useNimRtl):
if env == nil: if env == nil:
if poUsePath in options: if poUsePath in options:
discard execvp(sys_command, sys_args) discard execvp(sysCommand, sysArgs)
else: else:
discard execv(sys_command, sys_args) discard execv(sysCommand, sysArgs)
else: else:
var c_env = envToCStringArray(env) var cEnv = envToCStringArray(env)
if poUsePath in options: if poUsePath in options:
discard execvpe(sys_command, sys_args, c_env) discard execvpe(sysCommand, sysArgs, cEnv)
else: else:
discard execve(sys_command, sys_args, c_env) discard execve(sysCommand, sysArgs, cEnv)
# too risky to raise an exception here: # too risky to raise an exception here:
quit("execve call failed: " & $strerror(errno)) quit("execve call failed: " & $strerror(errno))
# Parent process. Copy process information. # Parent process. Copy process information.