1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* encoding.c (load_encoding): check if successfully loaded.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15107 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-18 03:25:15 +00:00
parent 3798f9ec04
commit 845ae33b17
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,4 +1,6 @@
Fri Jan 18 11:39:10 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jan 18 12:25:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (load_encoding): check if successfully loaded.
* encoding.c (rb_enc_find_index): use original encoding name to * encoding.c (rb_enc_find_index): use original encoding name to
replicate loaded encoding instead alias. replicate loaded encoding instead alias.

22
encoding.c
View File

@ -457,7 +457,10 @@ load_encoding(const char *name)
VALUE enclib = rb_sprintf("enc/%s", name); VALUE enclib = rb_sprintf("enc/%s", name);
VALUE verbose = ruby_verbose; VALUE verbose = ruby_verbose;
VALUE debug = ruby_debug; 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);
int idx;
while (s < e) { while (s < e) {
if (!ISALNUM(*s)) *s = '_'; if (!ISALNUM(*s)) *s = '_';
else if (ISUPPER(*s)) *s = TOLOWER(*s); else if (ISUPPER(*s)) *s = TOLOWER(*s);
@ -466,11 +469,14 @@ load_encoding(const char *name)
OBJ_FREEZE(enclib); OBJ_FREEZE(enclib);
ruby_verbose = Qfalse; ruby_verbose = Qfalse;
ruby_debug = Qfalse; ruby_debug = Qfalse;
rb_protect(require_enc, enclib, 0); loaded = rb_protect(require_enc, enclib, 0);
ruby_verbose = verbose; ruby_verbose = verbose;
ruby_debug = debug; ruby_debug = debug;
rb_set_errinfo(Qnil); rb_set_errinfo(Qnil);
return rb_enc_registered(name); if (NIL_P(loaded)) return -1;
if ((idx = rb_enc_registered(name)) < 0) return -1;
if (enc_autoload_p(enc_table.list[idx].enc)) return -1;
return idx;
} }
int int
@ -487,20 +493,14 @@ rb_enc_find_index(const char *name)
if (enc_initialized_p(enc) && if (enc_initialized_p(enc) &&
(base = enc_base_encoding(ENC_FROM_ENCODING(enc)), !NIL_P(base))) { (base = enc_base_encoding(ENC_FROM_ENCODING(enc)), !NIL_P(base))) {
if ((b = enc_check_encoding(base)) < 0) { if ((b = enc_check_encoding(base)) < 0) {
#if 0 goto failed;
st_data_t key, val;
key = (st_data_t)name;
if (st_delete(enc_table.names, &key, &val)) {
if (enc->name != (char *)key) xfree((char *)key);
}
#endif
return -1;
} }
enc_register_at(i, rb_enc_name(enc), rb_enc_from_index(b)); enc_register_at(i, rb_enc_name(enc), rb_enc_from_index(b));
} }
else { else {
i = load_encoding(rb_enc_name(enc)); i = load_encoding(rb_enc_name(enc));
if (enc_autoload_p(rb_enc_from_index(i))) { if (i < 0) {
failed:
rb_warn("failed to load encoding (%s); use ASCII-8BIT instead", rb_warn("failed to load encoding (%s); use ASCII-8BIT instead",
name); name);
return 0; return 0;