From 0a431f6903c6dcf60353e6831d4efa1d2176e67d Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 21 Jun 2012 10:03:23 +0000 Subject: * process.c (rb_exec_fillarg): take a VALUE argument instead of struct rb_execarg. (rb_execarg_init): follow the rb_exec_fillarg change. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36164 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- process.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'process.c') diff --git a/process.c b/process.c index 3eba7b12ef..ba59bdd58c 100644 --- a/process.c +++ b/process.c @@ -1881,8 +1881,9 @@ compare_posix_sh(const void *key, const void *el) #endif static void -rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, struct rb_execarg *e) +rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, VALUE execarg_obj) { + struct rb_execarg *e = rb_execarg_get(execarg_obj); VALUE options; char fbuf[MAXPATHLEN]; @@ -2050,6 +2051,7 @@ rb_exec_fillarg(VALUE prog, int argc, VALUE *argv, VALUE env, VALUE opthash, str rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* terminator for execve. */ e->invoke.cmd.argv_str = argv_str; } + RB_GC_GUARD(execarg_obj); } VALUE @@ -2077,7 +2079,7 @@ rb_execarg_init(int argc, VALUE *argv, int accept_shell, VALUE 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); + rb_exec_fillarg(prog, argc, argv, env, opthash, execarg_obj); ret = e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name; RB_GC_GUARD(execarg_obj); return ret; -- cgit v1.2.3