diff options
| author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-05 19:59:43 +0000 |
|---|---|---|
| committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-05 19:59:43 +0000 |
| commit | c8d6b6e8fa5b3309d5ac1c879ebb69da814e1d1f (patch) | |
| tree | e0e9d78e48274fd83b2e1ef359328606c97cfca4 | |
| parent | 0acd09c9e57dbaf506a5d2d6ac2bea5290994fce (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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | process.c | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Wed Jun 6 04:58:44 2012 Tanaka Akira <akr@fsij.org> + + * process.c (rb_spawn_process): prog variable is not used for Unix. + Wed Jun 6 00:20:37 2012 Tanaka Akira <akr@fsij.org> * internal.h (rb_exec_arg_init): change return type to void. @@ -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; } |
