From c29b801afad1dc5cb4227bcef9e4bc004c967b8a Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 1 Aug 2010 11:57:58 +0000 Subject: [PATCH] * ext/pathname/pathname.c (path_realpath): Pathname#realpath translated from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/pathname/lib/pathname.rb | 11 ----------- ext/pathname/pathname.c | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 62d112d33a..1d78571868 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun Aug 1 20:57:22 2010 Tanaka Akira + + * ext/pathname/pathname.c (path_realpath): Pathname#realpath translated + from pathname.rb. + Sun Aug 1 17:27:32 2010 Nobuyoshi Nakada * 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 @@ -179,17 +179,6 @@ class Pathname end 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 @@ -198,6 +198,23 @@ path_sub_ext(VALUE self, VALUE repl) return rb_class_new_instance(1, &str2, rb_obj_class(self)); } +/* + * 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 * @@ -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); }