ruby-changes:15851
From: nobu <ko1@a...>
Date: Thu, 13 May 2010 18:45:48 +0900 (JST)
Subject: [ruby-changes:15851] Ruby:r27785 (trunk): * ext/io/console/console.c (get_write_fd): return primary fd if no
nobu 2010-05-13 18:45:29 +0900 (Thu, 13 May 2010) New Revision: 27785 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=27785 Log: * ext/io/console/console.c (get_write_fd): return primary fd if no io is tied for writing. Modified files: trunk/ChangeLog trunk/ext/io/console/console.c trunk/test/io/console/test_io_console.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 27784) +++ ChangeLog (revision 27785) @@ -1,3 +1,8 @@ +Thu May 13 18:45:25 2010 Nobuyoshi Nakada <nobu@r...> + + * ext/io/console/console.c (get_write_fd): return primary fd if no + io is tied for writing. + Thu May 13 18:15:33 2010 NAKAMURA Usaku <usa@r...> * io.c (swallow): should use more_char() instead of fill_cbuf(). Index: ext/io/console/console.c =================================================================== --- ext/io/console/console.c (revision 27784) +++ ext/io/console/console.c (revision 27785) @@ -164,7 +164,7 @@ { VALUE wio = fptr->tied_io_for_writing; rb_io_t *ofptr; - if (!wio) return -1; + if (!wio) return fptr->fd; GetOpenFile(wio, ofptr); return ofptr->fd; } Index: test/io/console/test_io_console.rb =================================================================== --- test/io/console/test_io_console.rb (revision 27784) +++ test/io/console/test_io_console.rb (revision 27785) @@ -70,4 +70,13 @@ } end + def test_oflush + PTY.open {|m, s| + s.print "a\n" + s.oflush + s.print "b\n" + assert_equal("b\r\n", m.readpartial(10)) + } + end + end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/