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

* include/ruby/intern.h (rb_run_exec_options_err): renamed from

Browse Source 
rb_run_exec_options.
  (rb_exec_err): renamed from rb_exec.
  (rb_fork_err): renamed from rb_fork.
  (rb_spawn_err): renamed from rb_spawn.
  (rb_run_exec_options): declared with 1.9.1 compatible signature.
  (rb_exec): ditto.
  (rb_fork): ditto.
  (rb_spawn): ditto.

* process.c (rb_run_exec_options_err): renamed from
  rb_run_exec_options.
  (rb_exec_err): renamed from rb_exec.
  (rb_fork_err): renamed from rb_fork.
  (rb_spawn_err): renamed from rb_spawn.
  (rb_run_exec_options): defined.
  (rb_exec): ditto.
  (rb_fork): ditto.
  (rb_spawn): ditto.

* io.c: follow above change.

* ext/pty/pty.c: follow above change.

  [ruby-dev:37893]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22078 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-05 11:33:19 +00:00
parent 88f04bdd32
commit 74063bf4d3
5 changed files with 102 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ChangeLog
View File

@ -1,3 +1,31 @@
Thu Feb 5 20:28:27 2009 Tanaka Akira <akr@fsij.org>
* include/ruby/intern.h (rb_run_exec_options_err): renamed from
rb_run_exec_options.
(rb_exec_err): renamed from rb_exec.
(rb_fork_err): renamed from rb_fork.
(rb_spawn_err): renamed from rb_spawn.
(rb_run_exec_options): declared with 1.9.1 compatible signature.
(rb_exec): ditto.
(rb_fork): ditto.
(rb_spawn): ditto.
* process.c (rb_run_exec_options_err): renamed from
rb_run_exec_options.
(rb_exec_err): renamed from rb_exec.
(rb_fork_err): renamed from rb_fork.
(rb_spawn_err): renamed from rb_spawn.
(rb_run_exec_options): defined.
(rb_exec): ditto.
(rb_fork): ditto.
(rb_spawn): ditto.
* io.c: follow above change.
* ext/pty/pty.c: follow above change.
[ruby-dev:37893]
Thu Feb 5 19:58:40 2009 Tanaka Akira <akr@fsij.org> Thu Feb 5 19:58:40 2009 Tanaka Akira <akr@fsij.org>
* ext/socket: AddrInfo is renamed to Addrinfo. [ruby-dev:37876] * ext/socket: AddrInfo is renamed to Addrinfo. [ruby-dev:37876]

2
ext/pty/pty.c
View File

@ -258,7 +258,7 @@ establishShell(int argc, VALUE *argv, struct pty_info *info,
carg.slavename = SlaveName; carg.slavename = SlaveName;
carg.argc = argc; carg.argc = argc;
carg.argv = argv; carg.argv = argv;
pid = rb_fork(0, chfunc, &carg, Qnil, NULL, 0); pid = rb_fork(0, chfunc, &carg, Qnil);
if (pid < 0) { if (pid < 0) {
close(master); close(master);

12
include/ruby/intern.h
View File

@ -491,13 +491,17 @@ int rb_proc_exec(const char*);
VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e); VALUE rb_exec_arg_init(int argc, VALUE *argv, int accept_shell, struct rb_exec_arg *e);
int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val); int rb_exec_arg_addopt(struct rb_exec_arg *e, VALUE key, VALUE val);
void rb_exec_arg_fixup(struct rb_exec_arg *e); void rb_exec_arg_fixup(struct rb_exec_arg *e);
int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s, char*, size_t); int rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s);
int rb_exec(const struct rb_exec_arg*, char*, size_t); int rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char*, size_t);
rb_pid_t rb_fork(int*, int (*)(void*, char*, size_t), void*, VALUE, char*, size_t); int rb_exec(const struct rb_exec_arg*);
int rb_exec_err(const struct rb_exec_arg*, char*, size_t);
rb_pid_t rb_fork(int*, int (*)(void*), void*, VALUE);
rb_pid_t rb_fork_err(int*, int (*)(void*, char*, size_t), void*, VALUE, char*, size_t);
VALUE rb_f_exec(int,VALUE*); VALUE rb_f_exec(int,VALUE*);
rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags); rb_pid_t rb_waitpid(rb_pid_t pid, int *status, int flags);
void rb_syswait(rb_pid_t pid); void rb_syswait(rb_pid_t pid);
rb_pid_t rb_spawn(int, VALUE*, char*, size_t); rb_pid_t rb_spawn(int, VALUE*);
rb_pid_t rb_spawn_err(int, VALUE*, char*, size_t);
VALUE rb_proc_times(VALUE); VALUE rb_proc_times(VALUE);
VALUE rb_detach_process(rb_pid_t pid); VALUE rb_detach_process(rb_pid_t pid);
/* range.c */ /* range.c */

16
io.c
View File

@ -4489,7 +4489,7 @@ popen_exec(void *pp, char *errmsg, size_t errmsg_len)
struct popen_arg *p = (struct popen_arg*)pp; struct popen_arg *p = (struct popen_arg*)pp;
rb_thread_atfork_before_exec(); rb_thread_atfork_before_exec();
return rb_exec(p->execp, errmsg, errmsg_len); return rb_exec_err(p->execp, errmsg, errmsg_len);
} }
#endif #endif
@ -4575,11 +4575,11 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
} }
if (eargp) { if (eargp) {
rb_exec_arg_fixup(arg.execp); rb_exec_arg_fixup(arg.execp);
pid = rb_fork(&status, popen_exec, &arg, arg.execp->redirect_fds, errmsg, sizeof(errmsg)); pid = rb_fork_err(&status, popen_exec, &arg, arg.execp->redirect_fds, errmsg, sizeof(errmsg));
} }
else { else {
fflush(stdin); /* is it really needed? */ fflush(stdin); /* is it really needed? */
pid = rb_fork(&status, 0, 0, Qnil, NULL, 0); pid = rb_fork(&status, 0, 0, Qnil);
if (pid == 0) { /* child */ if (pid == 0) { /* child */
popen_redirect(&arg); popen_redirect(&arg);
rb_io_synchronized(RFILE(orig_stdout)->fptr); rb_io_synchronized(RFILE(orig_stdout)->fptr);
@ -4663,7 +4663,7 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
} }
if (eargp) { if (eargp) {
rb_exec_arg_fixup(eargp); rb_exec_arg_fixup(eargp);
rb_run_exec_options(eargp, &sarg, NULL, 0); rb_run_exec_options(eargp, &sarg);
} }
while ((pid = (args ? while ((pid = (args ?
rb_w32_aspawn(P_NOWAIT, 0, args) : rb_w32_aspawn(P_NOWAIT, 0, args) :
@ -4678,13 +4678,13 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
break; break;
default: default:
if (eargp) if (eargp)
rb_run_exec_options(&sarg, NULL, NULL, 0); rb_run_exec_options(&sarg, NULL);
rb_sys_fail(cmd); rb_sys_fail(cmd);
break; break;
} }
} }
if (eargp) if (eargp)
rb_run_exec_options(&sarg, NULL, NULL, 0); rb_run_exec_options(&sarg, NULL);
if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) { if ((fmode & FMODE_READABLE) && (fmode & FMODE_WRITABLE)) {
close(pair[1]); close(pair[1]);
fd = pair[0]; fd = pair[0];
@ -4706,11 +4706,11 @@ pipe_open(struct rb_exec_arg *eargp, VALUE prog, const char *modestr, int fmode,
} }
if (eargp) { if (eargp) {
rb_exec_arg_fixup(eargp); rb_exec_arg_fixup(eargp);
rb_run_exec_options(eargp, &sarg, NULL, 0); rb_run_exec_options(eargp, &sarg);
} }
fp = popen(cmd, modestr); fp = popen(cmd, modestr);
if (eargp) if (eargp)
rb_run_exec_options(&sarg, NULL, NULL, 0); rb_run_exec_options(&sarg, NULL);
if (!fp) rb_sys_fail(RSTRING_PTR(prog)); if (!fp) rb_sys_fail(RSTRING_PTR(prog));
fd = fileno(fp); fd = fileno(fp);
#endif #endif

70
process.c
View File

@ -1764,7 +1764,7 @@ rb_f_exec(int argc, VALUE *argv)
rb_exec_arg_addopt(&earg, ID2SYM(rb_intern("close_others")), Qfalse); rb_exec_arg_addopt(&earg, ID2SYM(rb_intern("close_others")), Qfalse);
rb_exec_arg_fixup(&earg); rb_exec_arg_fixup(&earg);
rb_exec(&earg, errmsg, sizeof(errmsg)); rb_exec_err(&earg, errmsg, sizeof(errmsg));
if (errmsg[0]) if (errmsg[0])
rb_sys_fail(errmsg); rb_sys_fail(errmsg);
rb_sys_fail(earg.prog); rb_sys_fail(earg.prog);
@ -2189,7 +2189,7 @@ run_exec_rlimit(VALUE ary, VALUE save, char *errmsg, size_t errmsg_buflen)
#endif #endif
int int
rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s, char *errmsg, size_t errmsg_buflen) rb_run_exec_options_err(const struct rb_exec_arg *e, struct rb_exec_arg *s, char *errmsg, size_t errmsg_buflen)
{ {
VALUE options = e->options; VALUE options = e->options;
VALUE soptions = Qnil; VALUE soptions = Qnil;
@ -2304,13 +2304,19 @@ rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s, char *er
} }
int int
rb_exec(const struct rb_exec_arg *e, char *errmsg, size_t errmsg_buflen) rb_run_exec_options(const struct rb_exec_arg *e, struct rb_exec_arg *s)
{
return rb_run_exec_options_err(e, s, NULL, 0);
}
int
rb_exec_err(const struct rb_exec_arg *e, char *errmsg, size_t errmsg_buflen)
{ {
int argc = e->argc; int argc = e->argc;
VALUE *argv = e->argv; VALUE *argv = e->argv;
const char *prog = e->prog; const char *prog = e->prog;
if (rb_run_exec_options(e, NULL, errmsg, errmsg_buflen) < 0) { if (rb_run_exec_options_err(e, NULL, errmsg, errmsg_buflen) < 0) {
return -1; return -1;
} }
@ -2329,12 +2335,18 @@ rb_exec(const struct rb_exec_arg *e, char *errmsg, size_t errmsg_buflen)
return -1; return -1;
} }
int
rb_exec(const struct rb_exec_arg *e)
{
return rb_exec_err(e, NULL, 0);
}
#ifdef HAVE_FORK #ifdef HAVE_FORK
static int static int
rb_exec_atfork(void* arg, char *errmsg, size_t errmsg_buflen) rb_exec_atfork(void* arg, char *errmsg, size_t errmsg_buflen)
{ {
rb_thread_atfork_before_exec(); rb_thread_atfork_before_exec();
return rb_exec(arg, errmsg, errmsg_buflen); return rb_exec_err(arg, errmsg, errmsg_buflen);
} }
#endif #endif
@ -2417,7 +2429,7 @@ pipe_nocrash(int filedes[2], VALUE fds)
* +chfunc+ must not raise any exceptions. * +chfunc+ must not raise any exceptions.
*/ */
rb_pid_t rb_pid_t
rb_fork(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds, rb_fork_err(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fds,
char *errmsg, size_t errmsg_buflen) char *errmsg, size_t errmsg_buflen)
{ {
rb_pid_t pid; rb_pid_t pid;
@ -2519,6 +2531,32 @@ rb_fork(int *status, int (*chfunc)(void*, char *, size_t), void *charg, VALUE fd
#endif #endif
return pid; return pid;
} }
struct chfunc_wrapper_t {
int (*chfunc)(void*);
void *arg;
};
static int
chfunc_wrapper(void *arg_, char *errmsg, size_t errmsg_buflen)
{
struct chfunc_wrapper_t *arg = arg_;
return arg->chfunc(arg->arg);
}
rb_pid_t
rb_fork(int *status, int (*chfunc)(void*), void *charg, VALUE fds)
{
if (chfunc) {
struct chfunc_wrapper_t warg = { chfunc, charg };
return rb_fork_err(status, chfunc_wrapper, &warg, fds, NULL, 0);
}
else {
return rb_fork_err(status, NULL, NULL, fds, NULL, 0);
}
}
#endif #endif
/* /*
@ -2550,7 +2588,7 @@ rb_f_fork(VALUE obj)
rb_secure(2); rb_secure(2);
switch (pid = rb_fork(0, 0, 0, Qnil, NULL, 0)) { switch (pid = rb_fork(0, 0, 0, Qnil)) {
case 0: case 0:
#ifdef linux #ifdef linux
after_exec(); after_exec();
@ -2802,10 +2840,10 @@ 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(&status, rb_exec_atfork, &earg, earg.redirect_fds, errmsg, errmsg_buflen); status = rb_fork_err(&status, 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(&earg, &sarg, errmsg, errmsg_buflen) < 0) { if (rb_run_exec_options_err(&earg, &sarg, errmsg, errmsg_buflen) < 0) {
return -1; return -1;
} }
@ -2829,17 +2867,23 @@ rb_spawn_internal(int argc, VALUE *argv, int default_close_others,
rb_last_status_set((status & 0xff) << 8, 0); rb_last_status_set((status & 0xff) << 8, 0);
# endif # endif
rb_run_exec_options(&sarg, NULL, errmsg, errmsg_buflen); rb_run_exec_options_err(&sarg, NULL, errmsg, errmsg_buflen);
#endif #endif
return status; return status;
} }
rb_pid_t rb_pid_t
rb_spawn(int argc, VALUE *argv, char *errmsg, size_t errmsg_buflen) rb_spawn_err(int argc, VALUE *argv, char *errmsg, size_t errmsg_buflen)
{ {
return rb_spawn_internal(argc, argv, Qtrue, errmsg, errmsg_buflen); return rb_spawn_internal(argc, argv, Qtrue, errmsg, errmsg_buflen);
} }
rb_pid_t
rb_spawn(int argc, VALUE *argv)
{
return rb_spawn_internal(argc, argv, Qtrue, NULL, 0);
}
/* /*
* call-seq: * call-seq:
* system([env,] command... [,options]) => true, false or nil * system([env,] command... [,options]) => true, false or nil
@ -3130,7 +3174,7 @@ rb_f_spawn(int argc, VALUE *argv)
rb_pid_t pid; rb_pid_t pid;
char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' }; char errmsg[CHILD_ERRMSG_BUFLEN] = { '\0' };
pid = rb_spawn(argc, argv, errmsg, sizeof(errmsg)); pid = rb_spawn_err(argc, argv, errmsg, sizeof(errmsg));
if (pid == -1) { if (pid == -1) {
if (errmsg[0] == '\0') if (errmsg[0] == '\0')
rb_sys_fail(RSTRING_PTR(argv[0])); rb_sys_fail(RSTRING_PTR(argv[0]));
@ -4471,7 +4515,7 @@ proc_daemon(int argc, VALUE *argv)
if (n < 0) rb_sys_fail("daemon"); if (n < 0) rb_sys_fail("daemon");
return INT2FIX(n); return INT2FIX(n);
#elif defined(HAVE_FORK) #elif defined(HAVE_FORK)
switch (rb_fork(0, 0, 0, Qnil, NULL, 0)) { switch (rb_fork(0, 0, 0, Qnil)) {
case -1: case -1:
return (-1); return (-1);
case 0: case 0: