summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-15 21:08:19 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-15 21:08:19 +0000
commitd0e9ac151e4b508221de5118ee653fafec3851c0 (patch)
treece95cf5e15472071ff12863532c9d079186bb622
parentef5948f0dca6cfad510754d6e721adc3fd9b381b (diff)
* ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29267 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/pathname/lib/pathname.rb3
-rw-r--r--ext/pathname/pathname.c10
3 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 557050d..7d127c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Sep 16 06:07:24 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/pathname/pathname.c (path_rmdir): Pathname#rmdir translated
+ from pathname.rb.
+
Thu Sep 16 00:36:25 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/readline/extconf.rb: Remove Readline 6 check because
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index fdbafc5..ac8d106 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -494,9 +494,6 @@ class Pathname # * Dir *
Dir.foreach(@path) {|f| yield self.class.new(f) }
end
- # See <tt>Dir.rmdir</tt>. Remove the referenced directory.
- def rmdir() Dir.rmdir(@path) end
-
# See <tt>Dir.open</tt>.
def opendir(&block) # :yield: dir
Dir.open(@path, &block)
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 1eeddfb..cc1fd8c 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -896,6 +896,15 @@ path_mkdir(int argc, VALUE *argv, VALUE self)
}
/*
+ * See <tt>Dir.rmdir</tt>. Remove the referenced directory.
+ */
+static VALUE
+path_rmdir(VALUE self)
+{
+ return rb_funcall(rb_cDir, rb_intern("rmdir"), 1, get_strpath(self));
+}
+
+/*
* == Pathname
*
* Pathname represents a pathname which locates a file in a filesystem.
@@ -1153,4 +1162,5 @@ Init_pathname()
rb_define_singleton_method(rb_cPathname, "pwd", path_s_getwd, 0);
rb_define_method(rb_cPathname, "entries", path_entries, 0);
rb_define_method(rb_cPathname, "mkdir", path_mkdir, -1);
+ rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
}