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

* process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in

Browse Source 
earg.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16192 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-04-25 06:35:48 +00:00
parent d90fe02fb6
commit 0023e16865
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Apr 25 15:35:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (rb_spawn): rb_exec_initarg() returns new argc and argv in
earg.
Fri Apr 25 12:37:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Apr 25 12:37:54 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (flatten): returns an instance of same class. * array.c (flatten): returns an instance of same class.

4
process.c
View File

@ -2557,6 +2557,8 @@ rb_spawn(int argc, VALUE *argv)
status = rb_fork(&status, rb_exec_atfork, &earg, earg.redirect_fds); status = rb_fork(&status, rb_exec_atfork, &earg, earg.redirect_fds);
if (prog && earg.argc) earg.argv[0] = prog; if (prog && earg.argc) earg.argv[0] = prog;
#elif defined HAVE_SPAWNV #elif defined HAVE_SPAWNV
argc = earg.argc;
argv = earg.argv;
if (!argc) { if (!argc) {
status = proc_spawn(RSTRING_PTR(prog)); status = proc_spawn(RSTRING_PTR(prog));
} }
@ -2565,6 +2567,8 @@ rb_spawn(int argc, VALUE *argv)
} }
if (prog && argc) argv[0] = prog; if (prog && argc) argv[0] = prog;
#else #else
argc = earg.argc;
argv = earg.argv;
if (prog && argc) argv[0] = prog; if (prog && argc) argv[0] = prog;
if (argc) prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" ")); if (argc) prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
status = system(StringValuePtr(prog)); status = system(StringValuePtr(prog));