kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* main.c, goruby.c (RUBY_MAIN_INIT): removed.

Browse source 
* 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
This commit is contained in:
nobu 2007-12-30 22:39:34 +00:00
parent 74dd31fadf
commit f610abc0a6
3 changed files with 29 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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> 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 * trunk/common.mk: not use -I$(srcdir)/lib with $(MINIRUBY) for cross

23
goruby.c
View file

@ -1,3 +1,24 @@
void Init_golf(void); void Init_golf(void);
#define RUBY_MAIN_INIT() Init_golf() #define ruby_run_node goruby_run_node
#include "main.c" #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);
}

3
main.c
View file

@ -33,9 +33,6 @@ main(int argc, char **argv, char **envp)
{ {
RUBY_INIT_STACK; RUBY_INIT_STACK;
ruby_init(); ruby_init();
#ifdef RUBY_MAIN_INIT
RUBY_MAIN_INIT();
#endif
return ruby_run_node(ruby_options(argc, argv)); return ruby_run_node(ruby_options(argc, argv));
} }
} }