4 files changed, 43 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 329988c587..d1ff3bdcc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec  3 14:51:26 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* load.c (ruby_require_internal): separate from rb_require_safe,
+	  not to raise exceptions.
+
+	* ruby.c (process_options): remove unnatural encoding search.
+
 Wed Dec  3 14:34:07 2014  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* string.c (setup_fake_str): fake string does not share another
diff --git a/dmyenc.c b/dmyenc.c
index 53646ef278..ec58043f88 100644
--- a/dmyenc.c
+++ b/dmyenc.c
@@ -1,4 +1,10 @@
+#define require(name) ruby_require_internal(name, (unsigned int)sizeof(name)-1)
+int ruby_require_internal(const char *, int);
+
 void
 Init_enc(void)
 {
+    if (require("enc/encdb.so") == 0) {
+	require("enc/trans/transdb.so");
+    }
 }
diff --git a/load.c b/load.c
index 445dcff9a5..833249a8e6 100644
--- a/load.c
+++ b/load.c
@@ -940,10 +940,10 @@ load_ext(VALUE path)
     return (VALUE)dln_load(RSTRING_PTR(path));
 }
 
-VALUE
-rb_require_safe(VALUE fname, int safe)
+static int
+rb_require_internal(VALUE fname, int safe)
 {
-    volatile VALUE result = Qnil;
+    volatile int result = -2;
     rb_thread_t *th = GET_THREAD();
     volatile VALUE errinfo = th->errinfo;
     int state;
@@ -985,11 +985,11 @@ rb_require_safe(VALUE fname, int safe)
 	}
 	if (found) {
 	    if (!path || !(ftptr = load_lock(RSTRING_PTR(path)))) {
-		result = Qfalse;
+		result = -1;
 	    }
 	    else if (!*ftptr) {
 		rb_provide_feature(path);
-		result = Qtrue;
+		result = 0;
 	    }
 	    else {
 		switch (found) {
@@ -1004,7 +1004,7 @@ rb_require_safe(VALUE fname, int safe)
 		    break;
 		}
 		rb_provide_feature(path);
-		result = Qtrue;
+		result = 0;
 	    }
 	}
     }
@@ -1013,11 +1013,7 @@ rb_require_safe(VALUE fname, int safe)
 
     rb_set_safe_level_force(saved.safe);
     if (state) {
-	JUMP_TAG(state);
-    }
-
-    if (NIL_P(result)) {
-	load_failed(fname);
+	return state;
     }
 
     th->errinfo = errinfo;
@@ -1031,6 +1027,29 @@ rb_require_safe(VALUE fname, int safe)
     return result;
 }
 
+int
+ruby_require_internal(const char *fname, unsigned int len)
+{
+    struct RString fake;
+    VALUE str = rb_setup_fake_str(&fake, fname, len, 0);
+    return rb_require_internal(str, 0);
+}
+
+VALUE
+rb_require_safe(VALUE fname, int safe)
+{
+    int result = rb_require_internal(fname, safe);
+
+    if (result > 0) {
+	JUMP_TAG(result);
+    }
+    if (result < -1) {
+	load_failed(fname);
+    }
+
+    return result ? Qfalse : Qtrue;
+}
+
 VALUE
 rb_require(const char *fname)
 {
diff --git a/ruby.c b/ruby.c
index 967c8a949f..2f714b082a 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1368,7 +1368,6 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
     ruby_gc_set_params(opt->safe_level);
     ruby_init_loadpath_safe(opt->safe_level);
     Init_enc();
-    rb_enc_find_index("encdb");
     lenc = rb_locale_encoding();
     rb_enc_associate(rb_progname, lenc);
     rb_obj_freeze(rb_progname);