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

* eval.c (search_required): deal with features with path too.

* intern.h (rb_file_expand_path): prototype.  fixed: [ruby-dev:26082]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-04-19 14:02:48 +00:00
parent 07eead8071
commit e313b6a9f1
3 changed files with 9 additions and 2 deletions

View file

@ -1,3 +1,9 @@
Tue Apr 19 23:02:40 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (search_required): deal with features with path too.
* intern.h (rb_file_expand_path): prototype. fixed: [ruby-dev:26082]
Tue Apr 19 08:38:07 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (search_required, rb_require_safe): expand path in

4
eval.c
View file

@ -6916,8 +6916,8 @@ search_required(fname, path)
}
}
}
else if (!strchr(ftptr, '/')) {
if (rb_feature_p(ftptr, 0, Qfalse)) return 's';
else if (ext = rb_feature_p(ftptr, 0, Qfalse)) {
return (*ext && (IS_SOEXT(ext) || IS_DLEXT(ext))) ? 's' : 'r';
}
tmp = fname;
type = rb_find_file_ext(&tmp, loadable_ext);

View file

@ -229,6 +229,7 @@ VALUE rb_exec_recursive _((VALUE(*)(ANYARGS),VALUE,VALUE));
/* file.c */
int eaccess _((const char*, int));
VALUE rb_file_s_expand_path _((int, VALUE *));
VALUE rb_file_expand_path _((VALUE, VALUE));
void rb_file_const _((const char*, VALUE));
int rb_find_file_ext _((VALUE*, const char* const*));
VALUE rb_find_file _((VALUE));