diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/pathname/lib/pathname.rb | 11 | ||||
| -rw-r--r-- | ext/pathname/pathname.c | 18 |
3 files changed, 23 insertions, 11 deletions
@@ -1,3 +1,8 @@ +Sun Aug 1 20:57:22 2010 Tanaka Akira <akr@fsij.org> + + * ext/pathname/pathname.c (path_realpath): Pathname#realpath translated + from pathname.rb. + Sun Aug 1 17:27:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/Makefile.sub: needs stddef.h for size_t. a patch from diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb index c30be4c948..760277e640 100644 --- a/ext/pathname/lib/pathname.rb +++ b/ext/pathname/lib/pathname.rb @@ -180,17 +180,6 @@ class Pathname private :cleanpath_conservative # - # Returns the real (absolute) pathname of +self+ in the actual - # filesystem not containing symlinks or useless dots. - # - # All components of the pathname must exist when this method is - # called. - # - def realpath(basedir=nil) - self.class.new(File.realpath(@path, basedir)) - end - - # # Returns the real (absolute) pathname of +self+ in the actual filesystem. # The real pathname doesn't contain symlinks or useless dots. # diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c index ecfe11cfc8..273ecee07c 100644 --- a/ext/pathname/pathname.c +++ b/ext/pathname/pathname.c @@ -199,6 +199,23 @@ path_sub_ext(VALUE self, VALUE repl) } /* + * Returns the real (absolute) pathname of +self+ in the actual + * filesystem not containing symlinks or useless dots. + * + * All components of the pathname must exist when this method is + * called. + * + */ +static VALUE +path_realpath(int argc, VALUE *argv, VALUE self) +{ + VALUE basedir, str; + rb_scan_args(argc, argv, "01", &basedir); + str = rb_funcall(rb_cFile, rb_intern("realpath"), 2, get_strpath(self), basedir); + return rb_class_new_instance(1, &str, rb_obj_class(self)); +} + +/* * == Pathname * * Pathname represents a pathname which locates a file in a filesystem. @@ -396,4 +413,5 @@ Init_pathname() rb_define_method(rb_cPathname, "inspect", path_inspect, 0); rb_define_method(rb_cPathname, "sub", path_sub, -1); rb_define_method(rb_cPathname, "sub_ext", path_sub_ext, 1); + rb_define_method(rb_cPathname, "realpath", path_realpath, -1); } |