summaryrefslogtreecommitdiff
path: root/goruby.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-30 22:39:34 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-30 22:39:34 (GMT)
commitf610abc0a6e2ac60f6bcb7756a42e755db48a260 (patch)
treec49f3385095fa52561a198b5eebf24c155514e39 /goruby.c
parent74dd31fadfdc3b0b399d6bf0350a34e381e3de9c (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14808 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'goruby.c')
-rw-r--r--goruby.c23
1 files changed, 22 insertions, 1 deletions
diff --git a/goruby.c b/goruby.c
index d16ea11..7cd3a22 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);
+}