summaryrefslogtreecommitdiff
path: root/ext/pathname/pathname.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-18 22:49:34 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-09-18 22:49:34 +0000
commitf9f73768486da483d039a2b6b7e7c31fe5842944 (patch)
treed1c38f11831573780b3e8bd06ebe1e34f49fe266 /ext/pathname/pathname.c
parentfb7fe14575f3b71fb98309a53fa05b32ada50203 (diff)
* ext/pathname/pathname.c (path_unlink): Pathname#unlink and
Pathname#delete translated from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/pathname/pathname.c')
-rw-r--r--ext/pathname/pathname.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 0583b0d..f5a0182 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -937,6 +937,30 @@ path_each_entry(VALUE self)
return rb_block_call(rb_cDir, rb_intern("foreach"), 1, args, each_entry_i, rb_obj_class(self));
}
+static VALUE
+unlink_body(VALUE str)
+{
+ return rb_funcall(rb_cDir, rb_intern("unlink"), 1, str);
+}
+
+static VALUE
+unlink_rescue(VALUE str, VALUE errinfo)
+{
+ return rb_funcall(rb_cFile, rb_intern("unlink"), 1, str);
+}
+
+/*
+ * Removes a file or directory, using <tt>File.unlink</tt> or
+ * <tt>Dir.unlink</tt> as necessary.
+ */
+static VALUE
+path_unlink(VALUE self)
+{
+ VALUE eENOTDIR = rb_const_get_at(rb_mErrno, rb_intern("ENOTDIR"));
+ VALUE str = get_strpath(self);
+ return rb_rescue2(unlink_body, str, unlink_rescue, str, eENOTDIR, (VALUE)0);
+}
+
/*
* == Pathname
*
@@ -1198,4 +1222,6 @@ Init_pathname()
rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
rb_define_method(rb_cPathname, "opendir", path_opendir, 0);
rb_define_method(rb_cPathname, "each_entry", path_each_entry, 0);
+ rb_define_method(rb_cPathname, "unlink", path_unlink, 0);
+ rb_define_method(rb_cPathname, "delete", path_unlink, 0);
}