* 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

1 files changed, 2 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index 73f04ce868..5807aa53b8 100644
--- a/eval.c
+++ b/eval.c
@@ -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);