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

* io.c (rb_io_check_readable): flush tied write IO too.

* io.c (Init_IO): tie stdin with stdout.  [ruby-core:15107]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-17 15:49:33 +00:00
parent a3776588ef
commit 64239e2291
2 changed files with 12 additions and 0 deletions

View file

@ -1,3 +1,9 @@
Fri Jan 18 00:49:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_check_readable): flush tied write IO too.
* io.c (Init_IO): tie stdin with stdout. [ruby-core:15107]
Fri Jan 18 00:23:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_free): removed since rb_encoding may be used while

6
io.c
View file

@ -363,6 +363,11 @@ rb_io_check_readable(rb_io_t *fptr)
if (fptr->wbuf_len) {
io_fflush(fptr);
}
if (fptr->tied_io_for_writing) {
rb_io_t *wfptr;
GetOpenFile(fptr->tied_io_for_writing, wfptr);
io_fflush(wfptr);
}
if (!fptr->enc && fptr->fd == 0) {
fptr->enc = rb_default_external_encoding();
}
@ -6647,6 +6652,7 @@ Init_IO(void)
rb_define_hooked_variable("$>", &rb_stdout, 0, stdout_setter);
orig_stdout = rb_stdout;
rb_deferr = orig_stderr = rb_stderr;
RFILE(rb_stdin)->fptr->tied_io_for_writing = rb_stdout;
/* constants to hold original stdin/stdout/stderr */
rb_define_global_const("STDIN", rb_stdin);