From 169ec127e0197bad550e9b2902f4c715d0c0b7a6 Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 27 Jan 2015 08:01:44 +0000 Subject: merge revision(s) 49244: [Backport #6232] * ext/readline/readline.c (readline_s_refresh_line): initialize before rl_refresh_line(), as some function make the internal state non-clean but rl_refresh_line() does not re-initialize it. [ruby-core:43957] [Bug #6232] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49424 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/readline/readline.c | 38 ++++++++++++++++++++++++++++++-------- test/readline/test_readline.rb | 12 ++++++++++++ version.h | 2 +- 4 files changed, 50 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index dce7d183bb..c6b5c7d749 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Tue Jan 27 16:49:07 2015 Nobuyoshi Nakada + + * ext/readline/readline.c (readline_s_refresh_line): initialize + before rl_refresh_line(), as some function make the internal + state non-clean but rl_refresh_line() does not re-initialize it. + [ruby-core:43957] [Bug #6232] + Tue Jan 27 16:41:33 2015 Seiei Higa * vm_method.c (rb_export_method): bail out if the original method diff --git a/ext/readline/readline.c b/ext/readline/readline.c index fe2ad7810d..e8c57f1b71 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -288,6 +288,34 @@ readline_get(VALUE prompt) return (VALUE)readline((char *)prompt); } +static void +prepare_readline(void) +{ + static int initialized = 0; + if (!initialized) { + rl_initialize(); + initialized = 1; + } + + if (readline_instream) { + rb_io_t *ifp; + rb_io_check_initialized(ifp = RFILE(rb_io_taint_check(readline_instream))->fptr); + if (ifp->fd < 0) { + clear_rl_instream(); + rb_raise(rb_eIOError, "closed readline input"); + } + } + + if (readline_outstream) { + rb_io_t *ofp; + rb_io_check_initialized(ofp = RFILE(rb_io_taint_check(readline_outstream))->fptr); + if (ofp->fd < 0) { + clear_rl_outstream(); + rb_raise(rb_eIOError, "closed readline output"); + } + } +} + /* * call-seq: * Readline.readline(prompt = "", add_hist = false) -> string or nil @@ -392,14 +420,7 @@ readline_readline(int argc, VALUE *argv, VALUE self) prompt = RSTRING_PTR(tmp); } - if (!isatty(fileno(rl_instream)) && errno == EBADF) rb_raise(rb_eIOError, "closed stdin"); - if (rl_outstream) { - struct stat stbuf; - int fd = fileno(rl_outstream); - if (fd < 0 || fstat(fd, &stbuf) != 0) { - rb_raise(rb_eIOError, "closed stdout"); - } - } + prepare_readline(); #ifdef _WIN32 rl_prep_terminal(1); @@ -1455,6 +1476,7 @@ static VALUE readline_s_refresh_line(VALUE self) { rb_secure(4); + prepare_readline(); rl_refresh_line(0, 0); return Qnil; } diff --git a/test/readline/test_readline.rb b/test/readline/test_readline.rb index 84cfcf2ae3..93aa8da09b 100644 --- a/test/readline/test_readline.rb +++ b/test/readline/test_readline.rb @@ -439,6 +439,18 @@ class TestReadline < Test::Unit::TestCase Readline::HISTORY.clear end if !/EditLine/n.match(Readline::VERSION) + def test_refresh_line + bug6232 = '[ruby-core:43957] [Bug #6232] refresh_line after set_screen_size' + with_temp_stdio do |stdin, stdout| + replace_stdio(stdin.path, stdout.path) do + assert_ruby_status(%w[-rreadline -], <<-'end;', bug6232) + Readline.set_screen_size(40, 80) + Readline.refresh_line + end; + end + end + end if Readline.respond_to?(:refresh_line) + private def replace_stdio(stdin_path, stdout_path) diff --git a/version.h b/version.h index 941b6c1b25..761eb782e3 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2015-01-27" -#define RUBY_PATCHLEVEL 619 +#define RUBY_PATCHLEVEL 620 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 1 -- cgit v1.2.3