diff options
Diffstat (limited to 'ext/readline/readline.c')
| -rw-r--r-- | ext/readline/readline.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/ext/readline/readline.c b/ext/readline/readline.c index ea9d97ca62..2e9a177c3b 100644 --- a/ext/readline/readline.c +++ b/ext/readline/readline.c @@ -29,7 +29,6 @@ #endif static VALUE mReadline; -static VALUE id_var_input; #define TOLOWER(c) (isupper(c) ? tolower(c) : c) @@ -95,18 +94,8 @@ readline_readline(int argc, VALUE *argv, VALUE self) add_history(buff); } if (buff) { - rb_encoding* enc; - VALUE input = rb_ivar_get(mReadline, id_var_input); - rb_io_t *ifp; - GetOpenFile(input, ifp); - if (ifp->enc) - enc = ifp->enc; - else if (ifp->mode & FMODE_BINMODE) - enc = rb_ascii8bit_encoding(); - else - enc = rb_default_external_encoding(); result = rb_tainted_str_new2(buff); - rb_enc_associate(result, enc); + rb_enc_associate(result, rb_locale_encoding()); } else result = Qnil; @@ -123,7 +112,6 @@ readline_s_set_input(VALUE self, VALUE input) Check_Type(input, T_FILE); GetOpenFile(input, ifp); rl_instream = rb_io_stdio_file(ifp); - rb_ivar_set(mReadline, id_var_input, input); return input; } @@ -769,9 +757,6 @@ Init_readline() rb_define_singleton_method(mReadline, "filename_quote_characters", readline_s_get_filename_quote_characters, 0); - id_var_input = rb_intern("#input"); - rb_ivar_set(mReadline, id_var_input, rb_stdin); - history = rb_obj_alloc(rb_cObject); rb_extend_object(history, rb_mEnumerable); rb_define_singleton_method(history,"to_s", hist_to_s, 0); |