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

matz

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@870 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2000-08-02 09:22:27 +00:00
parent f32c76a266
commit 6689997b5e
4 changed files with 26 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

37
ruby.c
View file

@ -166,8 +166,8 @@ rubylib_mangle(s, l)
#define rubylib_mangled_path2(s) rb_str_new2(s)
#endif
static void
incpush(path)
void
ruby_incpush(path)
const char *path;
{
const char sep = PATH_SEP_CHAR;
@ -203,36 +203,36 @@ incpush(path)
}
}
static void
ruby_path_init()
void
ruby_init_loadpath()
{
if (rb_safe_level() == 0) {
incpush(getenv("RUBYLIB"));
ruby_incpush(getenv("RUBYLIB"));
}
#ifdef RUBY_SEARCH_PATH
incpush(RUBY_SEARCH_PATH);
ruby_incpush(RUBY_SEARCH_PATH);
#endif
#ifdef RUBY_SITE_THIN_ARCHLIB
incpush(RUBY_SITE_THIN_ARCHLIB);
ruby_incpush(RUBY_SITE_THIN_ARCHLIB);
#endif
incpush(RUBY_SITE_ARCHLIB);
incpush(RUBY_SITE_LIB2);
incpush(RUBY_SITE_LIB);
ruby_incpush(RUBY_SITE_ARCHLIB);
ruby_incpush(RUBY_SITE_LIB2);
ruby_incpush(RUBY_SITE_LIB);
#ifdef RUBY_THIN_ARCHLIB
incpush(RUBY_THIN_ARCHLIB);
ruby_incpush(RUBY_THIN_ARCHLIB);
#endif
incpush(RUBY_ARCHLIB);
ruby_incpush(RUBY_ARCHLIB);
incpush(RUBY_LIB);
ruby_incpush(RUBY_LIB);
#if defined(_WIN32) || defined(DJGPP)
incpush(ruby_libpath());
ruby_incpush(ruby_libpath());
#endif
if (rb_safe_level() == 0) {
incpush(".");
ruby_incpush(".");
}
}
@ -360,7 +360,6 @@ proc_options(argc, argv)
if (argc == 0) return;
version = Qfalse;
do_search = Qfalse;
for (argc--,argv++; argc > 0; argc--,argv++) {
@ -515,9 +514,9 @@ proc_options(argc, argv)
case 'I':
forbid_setid("-I");
if (*++s)
incpush(s);
ruby_incpush(s);
else if (argv[1]) {
incpush(argv[1]);
ruby_incpush(argv[1]);
argc--,argv++;
}
break;
@ -659,7 +658,7 @@ proc_options(argc, argv)
ruby_set_argv(argc, argv);
process_sflag();
ruby_path_init();
ruby_init_loadpath();
ruby_sourcefile = argv0;
if (e_script) {
require_libraries();