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

io.c: rb_stderr_to_original_p

Browse Source 
* io.c (rb_stderr_to_original_p): hoist out the condition to write
  messages to the stderr FD directly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61646 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-07 04:10:06 +00:00
parent 707ab2c848
commit f39ea3d189
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
io.c
View File

@ -7763,10 +7763,16 @@ rb_obj_display(int argc, VALUE *argv, VALUE self)
return Qnil; return Qnil;
} }
static int
rb_stderr_to_original_p(void)
{
return (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0);
}
void void
rb_write_error2(const char *mesg, long len) rb_write_error2(const char *mesg, long len)
{ {
if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) { if (rb_stderr_to_original_p()) {
#ifdef _WIN32 #ifdef _WIN32
if (isatty(fileno(stderr))) { if (isatty(fileno(stderr))) {
if (rb_w32_write_console(rb_str_new(mesg, len), fileno(stderr)) > 0) return; if (rb_w32_write_console(rb_str_new(mesg, len), fileno(stderr)) > 0) return;
@ -7792,7 +7798,7 @@ void
rb_write_error_str(VALUE mesg) rb_write_error_str(VALUE mesg)
{ {
/* a stopgap measure for the time being */ /* a stopgap measure for the time being */
if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) { if (rb_stderr_to_original_p()) {
size_t len = (size_t)RSTRING_LEN(mesg); size_t len = (size_t)RSTRING_LEN(mesg);
#ifdef _WIN32 #ifdef _WIN32
if (isatty(fileno(stderr))) { if (isatty(fileno(stderr))) {
@ -7813,7 +7819,7 @@ rb_write_error_str(VALUE mesg)
int int
rb_stderr_tty_p(void) rb_stderr_tty_p(void)
{ {
if (rb_stderr == orig_stderr || RFILE(orig_stderr)->fptr->fd < 0) if (rb_stderr_to_original_p())
return isatty(fileno(stderr)); return isatty(fileno(stderr));
return 0; return 0;
} }