summaryrefslogtreecommitdiff
path: root/file.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-30 09:26:09 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-30 09:26:09 +0000
commit38af94c6abaaa20aeaa1ffafbe3f6ff962f63eaa (patch)
treeee5ca5d6f52312d1d6fd79c8e1f01ad3014ca45d /file.c
parent635bdf6f13712b7bb536a469734a5b4446e1923e (diff)
* file.c (rb_file_dirname): split from rb_file_s_dirname.
* load.c (rb_f_require_relative): use absolute path instead of expanded path. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27111 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'file.c')
-rw-r--r--file.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/file.c b/file.c
index 557085e1aa..af2730a12f 100644
--- a/file.c
+++ b/file.c
@@ -3428,9 +3428,15 @@ rb_file_s_basename(int argc, VALUE *argv)
* File.dirname("/home/gumby/work/ruby.rb") #=> "/home/gumby/work"
*/
-VALUE
+static VALUE
rb_file_s_dirname(VALUE klass, VALUE fname)
{
+ return rb_file_dirname(fname);
+}
+
+VALUE
+rb_file_dirname(VALUE fname)
+{
const char *name, *root, *p;
VALUE dirname;