mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
no argument conversions in rb_realpath_internal
* file.c (rb_realpath_internal): no argument conversions since this internal function does not need to_path and encoding conversions, not to be affected by the default internal encoding. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ee83372106
commit
3cd3c9d74c
2 changed files with 9 additions and 1 deletions
|
@ -1,3 +1,10 @@
|
|||
Sun Apr 10 17:47:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* file.c (rb_realpath_internal): no argument conversions since
|
||||
this internal function does not need to_path and encoding
|
||||
conversions, not to be affected by the default internal
|
||||
encoding.
|
||||
|
||||
Sat Apr 9 10:03:12 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* load.c (rb_f_load): raise with the original path name before
|
||||
|
|
3
file.c
3
file.c
|
@ -3828,7 +3828,6 @@ rb_realpath_internal(VALUE basedir, VALUE path, int strict)
|
|||
char *ptr, *prefixptr = NULL, *pend;
|
||||
long len;
|
||||
|
||||
FilePathValue(path);
|
||||
unresolved_path = rb_str_dup_frozen(path);
|
||||
|
||||
if (!NIL_P(basedir)) {
|
||||
|
@ -3915,6 +3914,7 @@ rb_file_s_realpath(int argc, VALUE *argv, VALUE klass)
|
|||
{
|
||||
VALUE path, basedir;
|
||||
rb_scan_args(argc, argv, "11", &path, &basedir);
|
||||
FilePathValue(path);
|
||||
return rb_realpath_internal(basedir, path, 1);
|
||||
}
|
||||
|
||||
|
@ -3935,6 +3935,7 @@ rb_file_s_realdirpath(int argc, VALUE *argv, VALUE klass)
|
|||
{
|
||||
VALUE path, basedir;
|
||||
rb_scan_args(argc, argv, "11", &path, &basedir);
|
||||
FilePathValue(path);
|
||||
return rb_realpath_internal(basedir, path, 0);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue