From 874dc2562d92a52a5f8795747e512f0deecf9065 Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 11 Aug 2013 17:58:07 +0000 Subject: * ext/readline/readline.c (readline_s_set_input): on OS X with editline, Readline.readline doesn't work because readline_get doesn't use rl_getc. The difference is introduced by r42402 [ruby-dev:47509] [Bug #8644]. Before it rb_io_stdio_file set ifp->stdio_file. Therefore add manually setting the value. * ext/readline/readline.c (readline_s_set_onput): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42525 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/readline/readline.c | 2 ++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 955db23..b045adc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Aug 12 02:51:32 2013 NARUSE, Yui + + * ext/readline/readline.c (readline_s_set_input): on OS X with editline, + Readline.readline doesn't work because readline_get doesn't use + rl_getc. The difference is introduced by r42402 [ruby-dev:47509] + [Bug #8644]. Before it rb_io_stdio_file set ifp->stdio_file. + Therefore add manually setting the value. + + * ext/readline/readline.c (readline_s_set_onput): ditto. + Sun Aug 11 23:27:00 2013 Nobuyoshi Nakada * file.c (rb_str_encode_ospath): OS path encoding on Mac OS X is also diff --git a/ext/readline/readline.c b/ext/readline/readline.c index 31a0b94..65f4ea0 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -503,6 +503,7 @@ readline_s_set_input(VALUE self, VALUE input) rb_sys_fail("fdopen"); } rl_instream = f; + ifp->stdio_file = f; readline_instream = input; } return input; @@ -557,6 +558,7 @@ readline_s_set_output(VALUE self, VALUE output) rb_sys_fail("fdopen"); } rl_outstream = f; + ofp->stdio_file = f; readline_outstream = output; } return output; -- cgit v1.1