1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* process.c (rb_exec_fillarg): take a VALUE argument instead of

Browse Source 
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
This commit is contained in:
akr 2012-06-21 10:03:23 +00:00
parent 129cad739b
commit 0a431f6903
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Jun 21 19:02:43 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_exec_fillarg): take a VALUE argument instead of
struct rb_execarg.
(rb_execarg_init): follow the rb_exec_fillarg change.
Thu Jun 21 18:36:43 2012 Tanaka Akira <akr@fsij.org> Thu Jun 21 18:36:43 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_execarg_init): take a VALUE argument instead of * process.c (rb_execarg_init): take a VALUE argument instead of

6
process.c
View File

@ -1881,8 +1881,9 @@ compare_posix_sh(const void *key, const void *el)
#endif #endif
static void 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; VALUE options;
char fbuf[MAXPATHLEN]; 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. */ rb_str_buf_cat(argv_str, (char *)&null, sizeof(null)); /* terminator for execve. */
e->invoke.cmd.argv_str = argv_str; e->invoke.cmd.argv_str = argv_str;
} }
RB_GC_GUARD(execarg_obj);
} }
VALUE VALUE
@ -2077,7 +2079,7 @@ rb_execarg_init(int argc, VALUE *argv, int accept_shell, VALUE execarg_obj)
VALUE prog, ret; VALUE prog, ret;
VALUE env = Qnil, opthash = Qnil; VALUE env = Qnil, opthash = Qnil;
prog = rb_exec_getargs(&argc, &argv, accept_shell, &env, &opthash); 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; ret = e->use_shell ? e->invoke.sh.shell_script : e->invoke.cmd.command_name;
RB_GC_GUARD(execarg_obj); RB_GC_GUARD(execarg_obj);
return ret; return ret;