diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-11 04:17:10 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-11 04:17:10 +0000 |
| commit | 9b853f214bcb180df7763366faa75f62fa4fdbf9 (patch) | |
| tree | 2cd5fb5213acfc5da4adf74e7ec603a0f259ce0b /encoding.c | |
| parent | 7688a02df4112df866b4fa738c8c479fda233deb (diff) | |
| download | ruby-9b853f214bcb180df7763366faa75f62fa4fdbf9.tar.gz ruby-9b853f214bcb180df7763366faa75f62fa4fdbf9.tar.xz ruby-9b853f214bcb180df7763366faa75f62fa4fdbf9.zip | |
* encoding.c (rb_enc_set_default_internal): defines internal
encoding as nil.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index d92a925aa..eb52f8375 100644 --- a/encoding.c +++ b/encoding.c @@ -38,6 +38,7 @@ static struct { void rb_enc_init(void); #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX +#define UNSPECIFIED_ENCODING INT_MAX #define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc)) @@ -507,7 +508,12 @@ rb_enc_find_index(const char *name) if (i < 0) { i = load_encoding(name); } - else if (enc_autoload_p(enc = rb_enc_from_index(i))) { + else if (!(enc = rb_enc_from_index(i))) { + if (i != UNSPECIFIED_ENCODING) { + rb_raise(rb_eArgError, "encoding %s is not registered", name); + } + } + else if (enc_autoload_p(enc)) { if (enc_autoload(enc) < 0) { rb_warn("failed to load encoding (%s); use ASCII-8BIT instead", name); @@ -1111,6 +1117,8 @@ rb_enc_set_default_internal(VALUE encoding) if (NIL_P(encoding)) { default_internal_index = -1; default_internal = 0; + st_insert(enc_table.names, (st_data_t)strdup("internal"), + (st_data_t)UNSPECIFIED_ENCODING); return; } |