From a984e00b80d78fdb9f6d2e0ec3bdfb0a80a06105 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 25 Jan 2008 08:12:15 +0000 Subject: * ruby.c (load_file): set default to ASCII-8BIT explicitly if -K option is not given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ruby.c | 6 ++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index b422149fa8..1237aaab78 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 25 17:12:13 2008 Nobuyoshi Nakada + + * ruby.c (load_file): set default to ASCII-8BIT explicitly if -K + option is not given. + Fri Jan 25 16:31:47 2008 Tanaka Akira * include/ruby/intern.h (rb_str_buf_cat_ascii): declared. diff --git a/ruby.c b/ruby.c index 739d78f44b..2de86c9170 100644 --- a/ruby.c +++ b/ruby.c @@ -1207,11 +1207,9 @@ load_file(VALUE parser, const char *fname, int script, struct cmdline_options *o } } else { - enc = 0; - } - if (enc) { - rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc)); + enc = rb_ascii8bit_encoding(); } + rb_funcall(f, rb_intern("set_encoding"), 1, rb_enc_from_encoding(enc)); tree = (NODE *)rb_parser_compile_file(parser, fname, f, line_start); if (script && rb_parser_end_seen_p(parser)) { rb_define_global_const("DATA", f); -- cgit v1.2.3