kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

process.c: separate check_exec_fds_1

Browse source 
* process.c (check_exec_fds): separate check_exec_fds_1() since
  nonstatic initializer of an aggregate type is not allowed by C89.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2012-06-24 13:53:44 +00:00
parent 5cc2112ed1
commit 5be0ab591c
2 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Jun 24 22:53:42 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* process.c (check_exec_fds): separate check_exec_fds_1() since
nonstatic initializer of an aggregate type is not allowed by C89.
Sun Jun 24 07:47:17 2012 Tanaka Akira <akr@fsij.org> Sun Jun 24 07:47:17 2012 Tanaka Akira <akr@fsij.org>
* internal.h (rb_execarg): options field removed. * internal.h (rb_execarg): options field removed.

34
process.c
View file

@ -1689,25 +1689,12 @@ check_exec_options_i(st_data_t st_key, st_data_t st_val, st_data_t arg)
return rb_execarg_addopt(execarg_obj, key, val); return rb_execarg_addopt(execarg_obj, key, val);
} }
static VALUE static int
check_exec_fds(struct rb_execarg *eargp) check_exec_fds_1(struct rb_execarg *eargp, VALUE h, int maxhint, VALUE ary)
{ {
VALUE h = rb_hash_new();
VALUE ary;
int maxhint = -1;
long i; long i;
int j;
VALUE fd_opts[] = {
eargp->fd_dup2,
eargp->fd_close,
eargp->fd_open,
eargp->fd_dup2_child
};
for (j = 0; j < (int)(sizeof(fd_opts)/sizeof(*fd_opts)); j++) { if (ary != Qfalse) {
ary = fd_opts[j];
if (ary == Qfalse)
continue;
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 fd = FIX2INT(RARRAY_PTR(elt)[0]); int fd = FIX2INT(RARRAY_PTR(elt)[0]);
@ -1729,6 +1716,21 @@ check_exec_fds(struct rb_execarg *eargp)
} }
} }
} }
return maxhint;
}
static VALUE
check_exec_fds(struct rb_execarg *eargp)
{
VALUE h = rb_hash_new();
VALUE ary;
int maxhint = -1;
long i;
maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_dup2);
maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_close);
maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_open);
maxhint = check_exec_fds_1(eargp, h, maxhint, eargp->fd_dup2_child);
if (eargp->fd_dup2_child) { if (eargp->fd_dup2_child) {
ary = eargp->fd_dup2_child; ary = eargp->fd_dup2_child;