summaryrefslogtreecommitdiff
path: root/process.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-05 19:59:43 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-05 19:59:43 +0000
commitc8d6b6e8fa5b3309d5ac1c879ebb69da814e1d1f (patch)
treee0e9d78e48274fd83b2e1ef359328606c97cfca4 /process.c
parent0acd09c9e57dbaf506a5d2d6ac2bea5290994fce (diff)
* process.c (rb_spawn_process): prog variable is not used for Unix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35931 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r--process.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/process.c b/process.c
index 1d0d2e3e66..d4f090f9a4 100644
--- a/process.c
+++ b/process.c
@@ -3126,20 +3126,20 @@ rb_exec_arg_prepare(struct rb_exec_arg *earg, int argc, VALUE *argv, int default
static rb_pid_t
rb_spawn_process(struct rb_exec_arg *earg, char *errmsg, size_t errmsg_buflen)
{
- VALUE prog;
rb_pid_t pid;
#if !USE_SPAWNV
int status;
#endif
#if !defined HAVE_FORK || USE_SPAWNV
+ VALUE prog;
struct rb_exec_arg sarg;
#endif
- prog = earg->use_shell ? earg->invoke.sh.shell_script : earg->invoke.cmd.command_name;
-
#if defined HAVE_FORK && !USE_SPAWNV
pid = rb_fork_err(&status, rb_exec_atfork, earg, earg->redirect_fds, errmsg, errmsg_buflen);
#else
+ prog = earg->use_shell ? earg->invoke.sh.shell_script : earg->invoke.cmd.command_name;
+
if (rb_run_exec_options_err(earg, &sarg, errmsg, errmsg_buflen) < 0) {
return -1;
}