* ruby.c (process_options): don't specify .so for encdb here.

"." is replaced by "_" in load_encoding.

* encoding.c (load_encoding): add .so here. 



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23821 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-06-22 16:21:09 +00:00
Родитель e0d24f31ed
Коммит 98aac1e651
3 изменённых файлов: 10 добавлений и 3 удалений

Просмотреть файл

@ -1,3 +1,10 @@
Tue Jun 23 01:17:38 2009 Tanaka Akira <akr@fsij.org>
* ruby.c (process_options): don't specify .so for encdb here.
"." is replaced by "_" in load_encoding.
* encoding.c (load_encoding): add .so here.
Mon Jun 22 23:24:22 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (rb_generic_ivar_memsize): typo fixed. a patch from

Просмотреть файл

@ -456,11 +456,11 @@ require_enc(VALUE enclib)
static int
load_encoding(const char *name)
{
VALUE enclib = rb_sprintf("enc/%s", name);
VALUE enclib = rb_sprintf("enc/%s.so", name);
VALUE verbose = ruby_verbose;
VALUE debug = ruby_debug;
VALUE loaded;
char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib);
char *s = RSTRING_PTR(enclib) + 4, *e = RSTRING_END(enclib) - 3;
int idx;
while (s < e) {

2
ruby.c
Просмотреть файл

@ -1298,7 +1298,7 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
rb_obj_freeze(opt->script_name);
ruby_init_loadpath_safe(opt->safe_level);
rb_enc_find_index("encdb.so");
rb_enc_find_index("encdb");
lenc = rb_locale_encoding();
rb_enc_associate(rb_progname, lenc);
parser = rb_parser_new();