diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-21 09:39:10 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-06-21 09:39:10 +0000 |
commit | 46e23dc03df77f6c3d4310233d2cf60902b98751 (patch) | |
tree | a04cc88bb66cad80afef5693173df20c81575081 /process.c | |
parent | 64ae33a18ae0e13444b6ab7c043450b2fe68c62b (diff) |
* process.c (rb_execarg_init): take a VALUE argument instead of
struct rb_execarg.
(rb_execarg_new): follow the rb_execarg_init change.
(rb_exec_arg_init): ditto.
* internal.h (rb_execarg_init): follow the definition change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36162 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'process.c')
-rw-r--r-- | process.c | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -2059,7 +2059,7 @@ rb_execarg_new(int argc, VALUE *argv, int accept_shell) struct rb_execarg *e; execarg_obj = TypedData_Make_Struct(rb_cData, struct rb_execarg, &exec_arg_data_type, e); hide_obj(execarg_obj); - rb_execarg_init(argc, argv, accept_shell, e); + rb_execarg_init(argc, argv, accept_shell, execarg_obj); return execarg_obj; } @@ -2071,19 +2071,22 @@ struct rb_execarg *rb_execarg_get(VALUE execarg_obj) } VALUE -rb_execarg_init(int argc, VALUE *argv, int accept_shell, struct rb_execarg *e) +rb_execarg_init(int argc, VALUE *argv, int accept_shell, VALUE execarg_obj) { - VALUE prog; + struct rb_execarg *e = rb_execarg_get(execarg_obj); + VALUE prog, ret; VALUE env = Qnil, opthash = Qnil; prog = rb_exec_getargs(&argc, &argv, accept_shell, &env, &opthash); rb_exec_fillarg(prog, argc, argv, env, opthash, e); - return e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name; + ret = e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name; + RB_GC_GUARD(execarg_obj); + return ret; } VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e) { - return rb_execarg_init(argc, argv, accept_shell, rb_execarg_get(e->execarg_obj)); + return rb_execarg_init(argc, argv, accept_shell, e->execarg_obj); } static int |