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

* file.c (rb_find_file_ext, rb_find_file): canonicalize absolute

Browse source 
paths.  [ruby-core:23845]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-06-14 01:49:23 +00:00
parent 122018e802
commit 439ad47eb8
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,4 +1,7 @@
Sun Jun 14 10:23:16 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Jun 14 10:49:18 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* file.c (rb_find_file_ext, rb_find_file): canonicalize absolute
paths. [ruby-core:23845]
* file.c (rb_file_size): added rdoc. a patch from Run Paint Run * file.c (rb_file_size): added rdoc. a patch from Run Paint Run
Run at [ruby-core:23839]. Run at [ruby-core:23839].

5
file.c
View file

@ -4621,12 +4621,11 @@ rb_find_file_ext(VALUE *filep, const char *const *ext)
} }
if (is_absolute_path(f) || is_explicit_relative(f)) { if (is_absolute_path(f) || is_explicit_relative(f)) {
fname = rb_str_dup(*filep); fname = rb_file_expand_path(*filep, Qnil);
fnlen = RSTRING_LEN(fname); fnlen = RSTRING_LEN(fname);
for (i=0; ext[i]; i++) { for (i=0; ext[i]; i++) {
rb_str_cat2(fname, ext[i]); rb_str_cat2(fname, ext[i]);
if (file_load_ok(StringValueCStr(fname))) { if (file_load_ok(StringValueCStr(fname))) {
if (!is_absolute_path(f)) fname = rb_file_expand_path(fname, Qnil);
OBJ_FREEZE(fname); OBJ_FREEZE(fname);
*filep = fname; *filep = fname;
return (int)(i+1); return (int)(i+1);
@ -4685,7 +4684,7 @@ rb_find_file(VALUE path)
rb_raise(rb_eSecurityError, "loading from unsafe file %s", f); rb_raise(rb_eSecurityError, "loading from unsafe file %s", f);
} }
if (!file_load_ok(f)) return 0; if (!file_load_ok(f)) return 0;
if (!is_absolute_path(f)) path = rb_file_expand_path(path, Qnil); path = rb_file_expand_path(path, Qnil);
return path; return path;
} }