archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Revert r49424. See [Bug #6232]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@49426 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-01-27 10:17:48 +00:00
parent d604893f20
commit 56c49c9780
4 changed files with 9 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -4,13 +4,6 @@ Tue Jan 27 17:05:43 2015 Seiei Higa <hanachin@gmail.com>
a refined method if the original method of the refined method is a refined method if the original method of the refined method is
not defined. [ruby-core:67523] [Bug #10731] not defined. [ruby-core:67523] [Bug #10731]
Tue Jan 27 16:49:07 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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 <hanachin@gmail.com> Tue Jan 27 16:41:33 2015 Seiei Higa <hanachin@gmail.com>
* vm_method.c (rb_export_method): bail out if the original method * vm_method.c (rb_export_method): bail out if the original method

38
ext/readline/readline.c
View file

@ -288,34 +288,6 @@ readline_get(VALUE prompt)
return (VALUE)readline((char *)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: * call-seq:
* Readline.readline(prompt = "", add_hist = false) -> string or nil * Readline.readline(prompt = "", add_hist = false) -> string or nil
@ -420,7 +392,14 @@ readline_readline(int argc, VALUE *argv, VALUE self)
prompt = RSTRING_PTR(tmp); prompt = RSTRING_PTR(tmp);
} }
prepare_readline(); 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");
}
}
#ifdef _WIN32 #ifdef _WIN32
rl_prep_terminal(1); rl_prep_terminal(1);
@ -1476,7 +1455,6 @@ static VALUE
readline_s_refresh_line(VALUE self) readline_s_refresh_line(VALUE self)
{ {
rb_secure(4); rb_secure(4);
prepare_readline();
rl_refresh_line(0, 0); rl_refresh_line(0, 0);
return Qnil; return Qnil;
} }

12
test/readline/test_readline.rb
View file

@ -439,18 +439,6 @@ class TestReadline < Test::Unit::TestCase
Readline::HISTORY.clear Readline::HISTORY.clear
end if !/EditLine/n.match(Readline::VERSION) 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 private
def replace_stdio(stdin_path, stdout_path) def replace_stdio(stdin_path, stdout_path)

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.0.0" #define RUBY_VERSION "2.0.0"
#define RUBY_RELEASE_DATE "2015-01-27" #define RUBY_RELEASE_DATE "2015-01-27"
#define RUBY_PATCHLEVEL 621 #define RUBY_PATCHLEVEL 622
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1