github
/
ruby
зеркало из https://github.com/github/ruby.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

* process.c: use the name "sargp" for struct rb_execarg variables 

consistently for saving process attributes. 

* io.c: ditto.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36191 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2012-06-23 00:18:32 +00:00
Родитель 0b3b2e885b
Коммит 5c25fad66d
3 изменённых файлов: 55 добавлений и 48 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

7
ChangeLog
Просмотреть файл

@ -1,3 +1,10 @@
Sat Jun 23 09:17:49 2012 Tanaka Akira <akr@fsij.org>
* process.c: use the name "sargp" for struct rb_execarg variables
consistently for saving process attributes.
* io.c: ditto.
Sat Jun 23 07:59:57 2012 Tanaka Akira <akr@fsij.org> Sat Jun 23 07:59:57 2012 Tanaka Akira <akr@fsij.org>
* process.c: use the name "eargp" for struct rb_execarg variables * process.c: use the name "eargp" for struct rb_execarg variables

12
io.c
Просмотреть файл

@ -5486,7 +5486,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
int pair[2], write_pair[2]; int pair[2], write_pair[2];
#endif #endif
#if !defined(HAVE_FORK) #if !defined(HAVE_FORK)
struct rb_execarg sarg; struct rb_execarg sarg, *sargp = &sarg;
#endif #endif
FILE *fp = 0; FILE *fp = 0;
int fd = -1; int fd = -1;
@ -5619,7 +5619,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
} }
if (!NIL_P(execarg_obj)) { if (!NIL_P(execarg_obj)) {
rb_execarg_fixup(execarg_obj); rb_execarg_fixup(execarg_obj);
rb_execarg_run_options(eargp, &sarg, NULL, 0); rb_execarg_run_options(eargp, sargp, NULL, 0);
} }
while ((pid = (args ? while ((pid = (args ?
rb_w32_aspawn(P_NOWAIT, cmd, args) : rb_w32_aspawn(P_NOWAIT, cmd, args) :
@ -5636,7 +5636,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
{ {
int e = errno; int e = errno;
if (eargp) if (eargp)
rb_execarg_run_options(&sarg, NULL, NULL, 0); rb_execarg_run_options(sargp, NULL, NULL, 0);
close(pair[0]); close(pair[0]);
close(pair[1]); close(pair[1]);
if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) { if ((fmode & (FMODE_READABLE|FMODE_WRITABLE)) == (FMODE_READABLE|FMODE_WRITABLE)) {
@ -5653,7 +5653,7 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
RB_GC_GUARD(argbuf); RB_GC_GUARD(argbuf);
if (eargp) if (eargp)
rb_execarg_run_options(&sarg, NULL, NULL, 0); rb_execarg_run_options(sargp, NULL, NULL, 0);
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];
@ -5675,11 +5675,11 @@ pipe_open(VALUE execarg_obj, const char *modestr, int fmode, convconfig_t *convc
} }
if (!NIL_P(execarg_obj)) { if (!NIL_P(execarg_obj)) {
rb_execarg_fixup(execarg_obj); rb_execarg_fixup(execarg_obj);
rb_execarg_run_options(eargp, &sarg, NULL, 0); rb_execarg_run_options(eargp, sargp, NULL, 0);
} }
fp = popen(cmd, modestr); fp = popen(cmd, modestr);
if (eargp) if (eargp)
rb_execarg_run_options(&sarg, NULL, NULL, 0); rb_execarg_run_options(sargp, NULL, NULL, 0);
if (!fp) rb_sys_fail_path(prog); if (!fp) rb_sys_fail_path(prog);
fd = fileno(fp); fd = fileno(fp);
#endif #endif

84
process.c
Просмотреть файл

@ -2341,10 +2341,10 @@ redirect_open(const char *pathname, int flags, mode_t perm)
#endif #endif
static int static int
save_redirect_fd(int fd, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) save_redirect_fd(int fd, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
if (s) { if (sargp) {
VALUE save = s->options; VALUE save = sargp->options;
VALUE newary; VALUE newary;
int save_fd = redirect_dup(fd); int save_fd = redirect_dup(fd);
if (save_fd == -1) { if (save_fd == -1) {
@ -2400,7 +2400,7 @@ run_exec_dup2_tmpbuf_size(long n)
/* This function should be async-signal-safe when _save_ is Qnil. Hopefully it is. */ /* This function should be async-signal-safe when _save_ is Qnil. Hopefully it is. */
static int static int
run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
long n, i; long n, i;
int ret; int ret;
@ -2419,7 +2419,7 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *s, char *errmsg, size_
} }
/* sort the table by oldfd: O(n log n) */ /* sort the table by oldfd: O(n log n) */
if (!s) if (!sargp)
qsort(pairs, n, sizeof(struct run_exec_dup2_fd_pair), intcmp); /* hopefully async-signal-safe */ qsort(pairs, n, sizeof(struct run_exec_dup2_fd_pair), intcmp); /* hopefully async-signal-safe */
else else
qsort(pairs, n, sizeof(struct run_exec_dup2_fd_pair), intrcmp); qsort(pairs, n, sizeof(struct run_exec_dup2_fd_pair), intrcmp);
@ -2446,7 +2446,7 @@ run_exec_dup2(VALUE ary, VALUE tmpbuf, struct rb_execarg *s, char *errmsg, size_
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
long j = i; long j = i;
while (j != -1 && pairs[j].oldfd != -1 && pairs[j].num_newer == 0) { while (j != -1 && pairs[j].oldfd != -1 && pairs[j].num_newer == 0) {
if (save_redirect_fd(pairs[j].newfd, s, errmsg, errmsg_buflen) < 0) /* async-signal-safe */ if (save_redirect_fd(pairs[j].newfd, sargp, errmsg, errmsg_buflen) < 0) /* async-signal-safe */
goto fail; goto fail;
ret = redirect_dup2(pairs[j].oldfd, pairs[j].newfd); /* async-signal-safe */ ret = redirect_dup2(pairs[j].oldfd, pairs[j].newfd); /* async-signal-safe */
if (ret == -1) { if (ret == -1) {
@ -2551,7 +2551,7 @@ run_exec_close(VALUE ary, char *errmsg, size_t errmsg_buflen)
/* This function should be async-signal-safe when _save_ is Qnil. Actually it is. */ /* This function should be async-signal-safe when _save_ is Qnil. Actually it is. */
static int static int
run_exec_open(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) run_exec_open(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
long i; long i;
int ret; int ret;
@ -2577,7 +2577,7 @@ run_exec_open(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg_bufle
need_close = 0; need_close = 0;
} }
else { else {
if (save_redirect_fd(fd, s, errmsg, errmsg_buflen) < 0) /* async-signal-safe */ if (save_redirect_fd(fd, sargp, errmsg, errmsg_buflen) < 0) /* async-signal-safe */
return -1; return -1;
ret = redirect_dup2(fd2, fd); /* async-signal-safe */ ret = redirect_dup2(fd2, fd); /* async-signal-safe */
if (ret == -1) { if (ret == -1) {
@ -2601,7 +2601,7 @@ run_exec_open(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg_bufle
/* This function should be async-signal-safe when _save_ is Qnil. Actually it is. */ /* This function should be async-signal-safe when _save_ is Qnil. Actually it is. */
static int static int
run_exec_dup2_child(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) run_exec_dup2_child(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
long i; long i;
int ret; int ret;
@ -2611,7 +2611,7 @@ run_exec_dup2_child(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg
int newfd = FIX2INT(RARRAY_PTR(elt)[0]); int newfd = FIX2INT(RARRAY_PTR(elt)[0]);
int oldfd = FIX2INT(RARRAY_PTR(elt)[1]); int oldfd = FIX2INT(RARRAY_PTR(elt)[1]);
if (save_redirect_fd(newfd, s, errmsg, errmsg_buflen) < 0) /* async-signal-safe */ if (save_redirect_fd(newfd, sargp, errmsg, errmsg_buflen) < 0) /* async-signal-safe */
return -1; return -1;
ret = redirect_dup2(oldfd, newfd); /* async-signal-safe */ ret = redirect_dup2(oldfd, newfd); /* async-signal-safe */
if (ret == -1) { if (ret == -1) {
@ -2626,7 +2626,7 @@ run_exec_dup2_child(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg
#ifdef HAVE_SETPGID #ifdef HAVE_SETPGID
/* This function should be async-signal-safe when _save_ is Qnil. Actually it is. */ /* This function should be async-signal-safe when _save_ is Qnil. Actually it is. */
static int static int
run_exec_pgroup(const struct rb_execarg *eargp, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) run_exec_pgroup(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
/* /*
* If FD_CLOEXEC is available, rb_fork waits the child's execve. * If FD_CLOEXEC is available, rb_fork waits the child's execve.
@ -2641,10 +2641,10 @@ run_exec_pgroup(const struct rb_execarg *eargp, struct rb_execarg *s, char *errm
if (pgroup == -1) if (pgroup == -1)
return 0; return 0;
if (s) { if (sargp) {
/* maybe meaningless with no fork environment... */ /* maybe meaningless with no fork environment... */
s->pgroup_given = 1; sargp->pgroup_given = 1;
s->pgroup_pgid = getpgrp(); sargp->pgroup_pgid = getpgrp();
} }
if (pgroup == 0) { if (pgroup == 0) {
@ -2659,15 +2659,15 @@ run_exec_pgroup(const struct rb_execarg *eargp, struct rb_execarg *s, char *errm
#if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM) #if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM)
/* This function should be async-signal-safe when _save_ is Qnil. Hopefully it is. */ /* This function should be async-signal-safe when _save_ is Qnil. Hopefully it is. */
static int static int
run_exec_rlimit(VALUE ary, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) run_exec_rlimit(VALUE ary, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
long i; long i;
for (i = 0; i < RARRAY_LEN(ary); i++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
VALUE elt = RARRAY_PTR(ary)[i]; VALUE elt = RARRAY_PTR(ary)[i];
int rtype = NUM2INT(RARRAY_PTR(elt)[0]); int rtype = NUM2INT(RARRAY_PTR(elt)[0]);
struct rlimit rlim; struct rlimit rlim;
if (s) { if (sargp) {
VALUE save = s->options; VALUE save = sargp->options;
VALUE tmp, newary; VALUE tmp, newary;
if (getrlimit(rtype, &rlim) == -1) { if (getrlimit(rtype, &rlim) == -1) {
ERRMSG("getrlimit"); ERRMSG("getrlimit");
@ -2703,12 +2703,12 @@ save_env_i(VALUE i, VALUE ary, int argc, VALUE *argv)
} }
static void static void
save_env(struct rb_execarg *s) save_env(struct rb_execarg *sargp)
{ {
VALUE save; VALUE save;
if (!s) if (!sargp)
return; return;
save = s->options; save = sargp->options;
if (NIL_P(rb_ary_entry(save, EXEC_OPTION_ENV))) { if (NIL_P(rb_ary_entry(save, EXEC_OPTION_ENV))) {
VALUE env = rb_const_get(rb_cObject, rb_intern("ENV")); VALUE env = rb_const_get(rb_cObject, rb_intern("ENV"));
if (RTEST(env)) { if (RTEST(env)) {
@ -2724,7 +2724,7 @@ save_env(struct rb_execarg *s)
/* This function should be async-signal-safe when _s_ is NULL. Hopefully it is. */ /* This function should be async-signal-safe when _s_ is NULL. Hopefully it is. */
int int
rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, char *errmsg, size_t errmsg_buflen) rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *sargp, char *errmsg, size_t errmsg_buflen)
{ {
VALUE options = eargp->options; VALUE options = eargp->options;
VALUE obj; VALUE obj;
@ -2732,16 +2732,16 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, cha
if (!RTEST(options)) if (!RTEST(options))
return 0; return 0;
if (s) { if (sargp) {
/* assume that s is always NULL on fork-able environments */ /* assume that sargp is always NULL on fork-able environments */
s->options = hide_obj(rb_ary_new()); sargp->options = hide_obj(rb_ary_new());
s->redirect_fds = Qnil; sargp->redirect_fds = Qnil;
s->envp_str = s->envp_buf = 0; sargp->envp_str = sargp->envp_buf = 0;
} }
#ifdef HAVE_SETPGID #ifdef HAVE_SETPGID
if (eargp->pgroup_given) { if (eargp->pgroup_given) {
if (run_exec_pgroup(eargp, s, errmsg, errmsg_buflen) == -1) /* async-signal-safe */ if (run_exec_pgroup(eargp, sargp, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
return -1; return -1;
} }
#endif #endif
@ -2749,7 +2749,7 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, cha
#if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM) #if defined(HAVE_SETRLIMIT) && defined(RLIM2NUM)
obj = rb_ary_entry(options, EXEC_OPTION_RLIMIT); obj = rb_ary_entry(options, EXEC_OPTION_RLIMIT);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
if (run_exec_rlimit(obj, s, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */ if (run_exec_rlimit(obj, sargp, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */
return -1; return -1;
} }
#endif #endif
@ -2757,14 +2757,14 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, cha
#if !defined(HAVE_FORK) #if !defined(HAVE_FORK)
obj = rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS); obj = rb_ary_entry(options, EXEC_OPTION_UNSETENV_OTHERS);
if (RTEST(obj)) { if (RTEST(obj)) {
save_env(s); save_env(sargp);
rb_env_clear(); rb_env_clear();
} }
obj = rb_ary_entry(options, EXEC_OPTION_ENV); obj = rb_ary_entry(options, EXEC_OPTION_ENV);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
long i; long i;
save_env(s); save_env(sargp);
for (i = 0; i < RARRAY_LEN(obj); i++) { for (i = 0; i < RARRAY_LEN(obj); i++) {
VALUE pair = RARRAY_PTR(obj)[i]; VALUE pair = RARRAY_PTR(obj)[i];
VALUE key = RARRAY_PTR(pair)[0]; VALUE key = RARRAY_PTR(pair)[0];
@ -2780,21 +2780,21 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, cha
if (eargp->umask_given) { if (eargp->umask_given) {
mode_t mask = eargp->umask_mask; mode_t mask = eargp->umask_mask;
mode_t oldmask = umask(mask); /* never fail */ /* async-signal-safe */ mode_t oldmask = umask(mask); /* never fail */ /* async-signal-safe */
if (s) { if (sargp) {
s->umask_given = 1; sargp->umask_given = 1;
s->umask_mask = oldmask; sargp->umask_mask = oldmask;
} }
} }
obj = rb_ary_entry(options, EXEC_OPTION_DUP2); obj = rb_ary_entry(options, EXEC_OPTION_DUP2);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
if (run_exec_dup2(obj, eargp->dup2_tmpbuf, s, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */ if (run_exec_dup2(obj, eargp->dup2_tmpbuf, sargp, errmsg, errmsg_buflen) == -1) /* hopefully async-signal-safe */
return -1; return -1;
} }
obj = rb_ary_entry(options, EXEC_OPTION_CLOSE); obj = rb_ary_entry(options, EXEC_OPTION_CLOSE);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
if (s) if (sargp)
rb_warn("cannot close fd before spawn"); rb_warn("cannot close fd before spawn");
else { else {
if (run_exec_close(obj, errmsg, errmsg_buflen) == -1) /* async-signal-safe */ if (run_exec_close(obj, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
@ -2811,21 +2811,21 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, cha
obj = rb_ary_entry(options, EXEC_OPTION_OPEN); obj = rb_ary_entry(options, EXEC_OPTION_OPEN);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
if (run_exec_open(obj, s, errmsg, errmsg_buflen) == -1) /* async-signal-safe */ if (run_exec_open(obj, sargp, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
return -1; return -1;
} }
obj = rb_ary_entry(options, EXEC_OPTION_DUP2_CHILD); obj = rb_ary_entry(options, EXEC_OPTION_DUP2_CHILD);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
if (run_exec_dup2_child(obj, s, errmsg, errmsg_buflen) == -1) /* async-signal-safe */ if (run_exec_dup2_child(obj, sargp, errmsg, errmsg_buflen) == -1) /* async-signal-safe */
return -1; return -1;
} }
obj = rb_ary_entry(options, EXEC_OPTION_CHDIR); obj = rb_ary_entry(options, EXEC_OPTION_CHDIR);
if (!NIL_P(obj)) { if (!NIL_P(obj)) {
if (s) { if (sargp) {
char *cwd = my_getcwd(); char *cwd = my_getcwd();
rb_ary_store(s->options, EXEC_OPTION_CHDIR, rb_ary_store(sargp->options, EXEC_OPTION_CHDIR,
hide_obj(rb_str_new2(cwd))); hide_obj(rb_str_new2(cwd)));
xfree(cwd); xfree(cwd);
} }
@ -2835,13 +2835,13 @@ rb_execarg_run_options(const struct rb_execarg *eargp, struct rb_execarg *s, cha
} }
} }
if (s) { if (sargp) {
VALUE ary = rb_ary_entry(s->options, EXEC_OPTION_DUP2); VALUE ary = rb_ary_entry(sargp->options, EXEC_OPTION_DUP2);
if (!NIL_P(ary)) { if (!NIL_P(ary)) {
size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary)); size_t len = run_exec_dup2_tmpbuf_size(RARRAY_LEN(ary));
VALUE tmpbuf = hide_obj(rb_str_new(0, len)); VALUE tmpbuf = hide_obj(rb_str_new(0, len));
rb_str_set_len(tmpbuf, len); rb_str_set_len(tmpbuf, len);
s->dup2_tmpbuf = tmpbuf; sargp->dup2_tmpbuf = tmpbuf;
} }
} }