1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.c: copy initial load path marks

Browse Source 
* ruby.c (process_options): also copy initial load path marks at
  setting load paths encoding.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51103 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-07-02 05:12:04 +00:00
parent 0ec5a272f1
commit aae22e3408
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Jul 2 14:12:01 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ruby.c (process_options): also copy initial load path marks at
setting load paths encoding.
Thu Jul 2 12:26:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Jul 2 12:26:11 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/rubygems/test_gem_server.rb (process_based_port): use * test/rubygems/test_gem_server.rb (process_based_port): use

7
ruby.c
View File

@ -396,6 +396,8 @@ dladdr_path(const void* addr)
} }
#endif #endif
#define INITIAL_LOAD_PATH_MARK rb_intern_const("@gem_prelude_index")
void void
ruby_init_loadpath_safe(int safe_level) ruby_init_loadpath_safe(int safe_level)
{ {
@ -513,7 +515,7 @@ ruby_init_loadpath_safe(int safe_level)
ruby_push_include(getenv("RUBYLIB"), identical_path); ruby_push_include(getenv("RUBYLIB"), identical_path);
} }
id_initial_load_path_mark = rb_intern_const("@gem_prelude_index"); id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
while (*paths) { while (*paths) {
size_t len = strlen(paths); size_t len = strlen(paths);
VALUE path = RUBY_RELATIVE(paths, len); VALUE path = RUBY_RELATIVE(paths, len);
@ -1421,9 +1423,12 @@ process_options(int argc, char **argv, struct cmdline_options *opt)
{ {
long i; long i;
VALUE load_path = GET_VM()->load_path; VALUE load_path = GET_VM()->load_path;
const ID id_initial_load_path_mark = INITIAL_LOAD_PATH_MARK;
for (i = 0; i < RARRAY_LEN(load_path); ++i) { for (i = 0; i < RARRAY_LEN(load_path); ++i) {
VALUE path = RARRAY_AREF(load_path, i); VALUE path = RARRAY_AREF(load_path, i);
int mark = rb_attr_get(path, id_initial_load_path_mark) == path;
path = rb_enc_associate(rb_str_dup(path), lenc); path = rb_enc_associate(rb_str_dup(path), lenc);
if (mark) rb_ivar_set(path, id_initial_load_path_mark, path);
RARRAY_ASET(load_path, i, path); RARRAY_ASET(load_path, i, path);
} }
} }