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

* process.c (rb_spawn_process): fix for Windows. not tested.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-03 15:45:46 +00:00
parent 78713916be
commit 6b348951ca
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Mon Jun 4 00:45:18 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_spawn_process): fix for Windows. not tested.
Mon Jun 4 00:11:51 2012 Tanaka Akira <akr@fsij.org> Mon Jun 4 00:11:51 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_proc_exec_e): don't use ISSPACE(). \f, \r and \v * process.c (rb_proc_exec_e): don't use ISSPACE(). \f, \r and \v

15
process.c
View File

@ -3094,14 +3094,17 @@ rb_spawn_process(struct rb_exec_arg *earg, VALUE prog, char *errmsg, size_t errm
return -1; return -1;
} }
argc = earg->argc; if (prog && !earg->use_shell) {
argv = earg->argv; char **argv = (char **)RSTRING_PTR(earg->argv_str);
if (prog && !earg->use_shell) argv[0] = prog; argv[0] = prog;
}
# if defined HAVE_SPAWNV # if defined HAVE_SPAWNV
if (earg->use_shell) { if (earg->use_shell) {
pid = proc_spawn(RSTRING_PTR(prog)); pid = proc_spawn(RSTRING_PTR(prog));
} }
else { else {
char **argv = (char **)RSTRING_PTR(earg->argv_str);
int argc = RSTRING_LEN(earg->argv_str) / sizeof(char *) - 1;
pid = proc_spawn_n(argc, argv, prog, earg->options); pid = proc_spawn_n(argc, argv, prog, earg->options);
} }
# if defined(_WIN32) # if defined(_WIN32)
@ -3109,7 +3112,11 @@ rb_spawn_process(struct rb_exec_arg *earg, VALUE prog, char *errmsg, size_t errm
rb_last_status_set(0x7f << 8, 0); rb_last_status_set(0x7f << 8, 0);
# endif # endif
# else # else
if (!earg->use_shell) prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" ")); if (!earg->use_shell) {
char **argv = (char **)RSTRING_PTR(earg->argv_str);
int argc = RSTRING_LEN(earg->argv_str) / sizeof(char *) - 1;
prog = rb_ary_join(rb_ary_new4(argc, argv), rb_str_new2(" "));
}
status = system(StringValuePtr(prog)); status = system(StringValuePtr(prog));
rb_last_status_set((status & 0xff) << 8, 0); rb_last_status_set((status & 0xff) << 8, 0);
# endif # endif