diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:58:51 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-13 01:58:51 +0000 |
commit | 77e495da3c9713100aa384982e08c73ecc2f57eb (patch) | |
tree | cafd7eb222e4f5f0ee7200e014fc1063f67daf29 /load.c | |
parent | 2150252722441add5f290878531cd5f450421ee8 (diff) |
merges r20655 from trunk into ruby_1_9_1.
* load.c (rb_feature_p): load path must be expanded.
[ruby-dev:37388]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20706 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r-- | load.c | 19 |
1 files changed, 18 insertions, 1 deletions
@@ -33,6 +33,22 @@ rb_get_load_path(void) return load_path; } +VALUE +rb_get_expanded_load_path(void) +{ + VALUE load_path = rb_get_load_path(); + VALUE ary = rb_ary_new2(RARRAY_LEN(load_path)); + long i; + + for (i = 0; i < RARRAY_LEN(load_path); ++i) { + VALUE path = rb_file_expand_path(RARRAY_PTR(load_path)[i], Qnil); + rb_str_freeze(path); + rb_ary_push(ary, path); + } + rb_obj_freeze(ary); + return ary; +} + static VALUE load_path_getter(ID id, rb_vm_t *vm) { @@ -128,9 +144,10 @@ rb_feature_p(const char *feature, const char *ext, int rb, int expanded, const c if ((n = RSTRING_LEN(v)) < len) continue; if (strncmp(f, feature, len) != 0) { if (expanded) continue; - if (!load_path) load_path = rb_get_load_path(); + if (!load_path) load_path = rb_get_expanded_load_path(); if (!(p = loaded_feature_path(f, n, feature, len, type, load_path))) continue; + expanded = 1; f += RSTRING_LEN(p) + 1; } if (!*(e = f + len)) { |