deac/ruby-lxc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Better check for std{in,out,err} attach options

Browse source
This commit is contained in:
Andre Nathan 2014-09-24 10:28:22 -03:00
parent 6024d0e40b
commit 10ff154014
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ext/lxc/lxc.c
View file

@ -546,10 +546,10 @@ is_string_array(VALUE v)
} }
static int static int
is_io(VALUE v) has_file_descriptor(VALUE v)
{ {
return rb_respond_to(v, rb_intern("sysread")) && return rb_respond_to(v, rb_intern("fileno")) &&
rb_respond_to(v, rb_intern("syswrite")); rb_funcall(v, rb_intern("fileno"), 0) != Qnil;
} }
static void static void
@ -648,21 +648,21 @@ lxc_attach_parse_options(VALUE rb_opts)
} }
rb_stdin = rb_hash_aref(rb_opts, SYMBOL("stdin")); rb_stdin = rb_hash_aref(rb_opts, SYMBOL("stdin"));
if (!NIL_P(rb_stdin)) { if (!NIL_P(rb_stdin)) {
if (is_io(rb_stdin)) if (has_file_descriptor(rb_stdin))
opts->stdin_fd = io_fileno(rb_stdin); opts->stdin_fd = io_fileno(rb_stdin);
else else
goto err; goto err;
} }
rb_stdout = rb_hash_aref(rb_opts, SYMBOL("stdout")); rb_stdout = rb_hash_aref(rb_opts, SYMBOL("stdout"));
if (!NIL_P(rb_stdout)) { if (!NIL_P(rb_stdout)) {
if (is_io(rb_stdout)) if (has_file_descriptor(rb_stdout))
opts->stdout_fd = io_fileno(rb_stdout); opts->stdout_fd = io_fileno(rb_stdout);
else else
goto err; goto err;
} }
rb_stderr = rb_hash_aref(rb_opts, SYMBOL("stderr")); rb_stderr = rb_hash_aref(rb_opts, SYMBOL("stderr"));
if (!NIL_P(rb_stderr)) { if (!NIL_P(rb_stderr)) {
if (is_io(rb_stderr)) if (has_file_descriptor(rb_stderr))
opts->stderr_fd = io_fileno(rb_stderr); opts->stderr_fd = io_fileno(rb_stderr);
else else
goto err; goto err;