3 files changed, 29 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9773724ad2..ca4af70265 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Dec 31 07:39:31 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* main.c, goruby.c (RUBY_MAIN_INIT): removed.
+
+	* goruby.c (goruby_run_node): run after ruby_init_loadpath() so that
+	  require works, and protect the call.
+
 Mon Dec 31 06:50:38 2007  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross
diff --git a/goruby.c b/goruby.c
index d16ea11d5e..7cd3a2262b 100644
--- a/goruby.c
+++ b/goruby.c
@@ -1,3 +1,24 @@
 void Init_golf(void); 
-#define RUBY_MAIN_INIT() Init_golf()
+#define ruby_run_node goruby_run_node
 #include "main.c"
+#undef ruby_run_node
+
+RUBY_EXTERN int ruby_run_node(void*);
+RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
+
+static VALUE
+init_golf(VALUE arg)
+{
+    ruby_init_ext("golf", Init_golf);
+    return arg;
+}
+
+int
+goruby_run_node(void *arg)
+{
+    int state;
+    if (NIL_P(rb_protect(init_golf, Qtrue, &state))) {
+	return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
+    }
+    return ruby_run_node(arg);
+}
diff --git a/main.c b/main.c
index 2cdb45f7b9..e438b9c7b8 100644
--- a/main.c
+++ b/main.c
@@ -33,9 +33,6 @@ main(int argc, char **argv, char **envp)
     {
 	RUBY_INIT_STACK;
 	ruby_init();
-#ifdef RUBY_MAIN_INIT
-	RUBY_MAIN_INIT();
-#endif
 	return ruby_run_node(ruby_options(argc, argv));
     }
 }