kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/pathname/pathname.c (path_unlink): Pathname#unlink and

Browse source 
Pathname#delete translated from pathname.rb.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-09-18 22:49:34 +00:00
parent fb7fe14575
commit f9f7376848
3 changed files with 31 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Sep 19 07:48:20 2010 Tanaka Akira <akr@fsij.org>
* ext/pathname/pathname.c (path_unlink): Pathname#unlink and
Pathname#delete translated from pathname.rb.
Sun Sep 19 06:06:07 2010 Kenta Murata <mrkn@mrkn.jp> Sun Sep 19 06:06:07 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/bigdecimal/bigdecimal.c (check_rounding_mode): added for * ext/bigdecimal/bigdecimal.c (check_rounding_mode): added for

13
ext/pathname/lib/pathname.rb
View file

@ -526,19 +526,6 @@ class Pathname # * FileUtils *
end end
class Pathname # * mixed *
# Removes a file or directory, using <tt>File.unlink</tt> or
# <tt>Dir.unlink</tt> as necessary.
def unlink()
begin
Dir.unlink @path
rescue Errno::ENOTDIR
File.unlink @path
end
end
alias delete unlink
end
class Pathname class Pathname
undef =~ undef =~
end end

26
ext/pathname/pathname.c
View file

@ -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)); 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 * == Pathname
* *
@ -1198,4 +1222,6 @@ Init_pathname()
rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0); rb_define_method(rb_cPathname, "rmdir", path_rmdir, 0);
rb_define_method(rb_cPathname, "opendir", path_opendir, 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, "each_entry", path_each_entry, 0);
rb_define_method(rb_cPathname, "unlink", path_unlink, 0);
rb_define_method(rb_cPathname, "delete", path_unlink, 0);
} }