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

* process.c (rb_f_system): use rb_pid_t for pid.

Browse Source 
(rb_spawn_internal): local variable renamed.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22948 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-03-14 05:46:43 +00:00
parent 24ccacfafd
commit ec5e44f2c7
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Mar 14 14:45:51 2009 Tanaka Akira <akr@fsij.org>
* process.c (rb_f_system): use rb_pid_t for pid.
(rb_spawn_internal): local variable renamed.
Sat Mar 14 14:16:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Mar 14 14:16:02 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* util.c (ruby_strdup, Balloc, rv_alloc): use size_t. * util.c (ruby_strdup, Balloc, rv_alloc): use size_t.

25
process.c
View File

@ -2837,7 +2837,7 @@ static rb_pid_t
rb_spawn_internal(int argc, VALUE *argv, int default_close_others, rb_spawn_internal(int argc, VALUE *argv, int default_close_others,
char *errmsg, size_t errmsg_buflen) char *errmsg, size_t errmsg_buflen)
{ {
rb_pid_t status; rb_pid_t pid;
VALUE prog; VALUE prog;
struct rb_exec_arg earg; struct rb_exec_arg earg;
#if !defined HAVE_FORK #if !defined HAVE_FORK
@ -2852,7 +2852,7 @@ rb_spawn_internal(int argc, VALUE *argv, int default_close_others,
rb_exec_arg_fixup(&earg); rb_exec_arg_fixup(&earg);
#if defined HAVE_FORK #if defined HAVE_FORK
status = rb_fork_err(&status, rb_exec_atfork, &earg, earg.redirect_fds, errmsg, errmsg_buflen); pid = rb_fork_err(&pid, rb_exec_atfork, &earg, earg.redirect_fds, errmsg, errmsg_buflen);
if (prog && earg.argc) earg.argv[0] = prog; if (prog && earg.argc) earg.argv[0] = prog;
#else #else
if (rb_run_exec_options_err(&earg, &sarg, errmsg, errmsg_buflen) < 0) { if (rb_run_exec_options_err(&earg, &sarg, errmsg, errmsg_buflen) < 0) {
@ -2864,24 +2864,24 @@ rb_spawn_internal(int argc, VALUE *argv, int default_close_others,
if (prog && argc) argv[0] = prog; if (prog && argc) argv[0] = prog;
# if defined HAVE_SPAWNV # if defined HAVE_SPAWNV
if (!argc) { if (!argc) {
status = proc_spawn(RSTRING_PTR(prog)); pid = proc_spawn(RSTRING_PTR(prog));
} }
else { else {
status = proc_spawn_n(argc, argv, prog); pid = proc_spawn_n(argc, argv, prog);
} }
# if defined(_WIN32) # if defined(_WIN32)
if (status == -1) if (pid == -1)
rb_last_status_set(0x7f << 8, 0); rb_last_status_set(0x7f << 8, 0);
# endif # endif
# else # else
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)); pid = system(StringValuePtr(prog));
rb_last_status_set((status & 0xff) << 8, 0); rb_last_status_set((pid & 0xff) << 8, 0);
# endif # endif
rb_run_exec_options_err(&sarg, NULL, errmsg, errmsg_buflen); rb_run_exec_options_err(&sarg, NULL, errmsg, errmsg_buflen);
#endif #endif
return status; return pid;
} }
rb_pid_t rb_pid_t
@ -2930,6 +2930,7 @@ rb_spawn(int argc, VALUE *argv)
static VALUE static VALUE
rb_f_system(int argc, VALUE *argv) rb_f_system(int argc, VALUE *argv)
{ {
rb_pid_t pid;
int status; int status;
#if defined(SIGCLD) && !defined(SIGCHLD) #if defined(SIGCLD) && !defined(SIGCHLD)
@ -2941,16 +2942,16 @@ rb_f_system(int argc, VALUE *argv)
chfunc = signal(SIGCHLD, SIG_DFL); chfunc = signal(SIGCHLD, SIG_DFL);
#endif #endif
status = rb_spawn_internal(argc, argv, Qfalse, NULL, 0); pid = rb_spawn_internal(argc, argv, Qfalse, NULL, 0);
#if defined(HAVE_FORK) || defined(HAVE_SPAWNV) #if defined(HAVE_FORK) || defined(HAVE_SPAWNV)
if (status > 0) { if (pid > 0) {
rb_syswait(status); rb_syswait(pid);
} }
#endif #endif
#ifdef SIGCHLD #ifdef SIGCHLD
signal(SIGCHLD, chfunc); signal(SIGCHLD, chfunc);
#endif #endif
if (status < 0) { if (pid < 0) {
return Qnil; return Qnil;
} }
status = PST2INT(rb_last_status_get()); status = PST2INT(rb_last_status_get());