Project

General

Profile

Bug #7391 ยป require_relative_from_evail_and_irb.patch

zzak (zzak _), 11/19/2012 11:10 AM

View differences:

load.c
{
VALUE base = rb_current_realfilepath();
if (NIL_P(base)) {
rb_loaderror("cannot infer basepath");
VALUE path = rb_find_file(FilePathValue(fname));
if (!path)
path = fname;
return rb_require_safe(rb_realpath_internal(Qnil, path, 0), rb_safe_level());
}
base = rb_file_dirname(base);
return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level());
-
load.c
VALUE path = rb_find_file(FilePathValue(fname));
if (!path)
path = fname;
return rb_require_safe(rb_realpath_internal(Qnil, path, 0), rb_safe_level());
return rb_require_safe(path, rb_safe_level());
}
base = rb_file_dirname(base);
return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level());
-
load.c
{
VALUE base = rb_current_realfilepath();
if (NIL_P(base)) {
VALUE path = rb_find_file(FilePathValue(fname));
VALUE path = FilePathValue(fname);
if (!path)
path = fname;
return rb_require_safe(path, rb_safe_level());
-
load.c
{
VALUE base = rb_current_realfilepath();
if (NIL_P(base)) {
VALUE path = FilePathValue(fname);
if (!path)
path = fname;
return rb_require_safe(path, rb_safe_level());
if(!NIL_P(fname))
return rb_require_safe(fname, rb_safe_level());
}
base = rb_file_dirname(base);
return rb_require_safe(rb_file_absolute_path(fname, base), rb_safe_level());
    (1-1/1)