diff options
Diffstat (limited to 'ext')
-rw-r--r-- | ext/pathname/lib/pathname.rb | 3 | ||||
-rw-r--r-- | ext/pathname/pathname.c | 16 |
2 files changed, 16 insertions, 3 deletions
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index 54b06eefbc..2056477eef 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -512,9 +512,6 @@ end class Pathname # * File * - # See <tt>File.expand_path</tt>. - def expand_path(*args) self.class.new(File.expand_path(@path, *args)) end - # See <tt>File.split</tt>. Returns the #dirname and the #basename in an # Array. def split() File.split(@path).map {|f| self.class.new(f) } end diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index 834fa446da..2ebb976de2 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -460,6 +460,21 @@ path_extname(VALUE self) } /* + * See <tt>File.expand_path</tt>. + */ +static VALUE +path_expand_path(int argc, VALUE *argv, VALUE self) +{ + VALUE str = get_strpath(self); + VALUE dname; + if (rb_scan_args(argc, argv, "01", &dname) == 0) + str = rb_funcall(rb_cFile, rb_intern("expand_path"), 1, str); + else + str = rb_funcall(rb_cFile, rb_intern("expand_path"), 2, str, dname); + return rb_class_new_instance(1, &str, rb_obj_class(self)); +} + +/* * == Pathname * * Pathname represents a pathname which locates a file in a filesystem. @@ -681,4 +696,5 @@ Init_pathname() rb_define_method(rb_cPathname, "basename", path_basename, -1); rb_define_method(rb_cPathname, "dirname", path_dirname, 0); rb_define_method(rb_cPathname, "extname", path_extname, 0); + rb_define_method(rb_cPathname, "expand_path", path_expand_path, -1); } |