aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-26 13:35:18 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-07-26 13:35:18 +0000
commitaa4f1d8e81b21d9f0ee19b5041595effacf77201 (patch)
tree1592819e3c6847146b67e4827106199d5f6cf508
parent195a7da4ec0b726005b22c8f88f353d7c3f24bfc (diff)
downloadruby-aa4f1d8e81b21d9f0ee19b5041595effacf77201.tar.gz
* ext/pathname/pathname.c (path_taint): Pathname#taint translated from
pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28760 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/pathname/lib/pathname.rb1
-rw-r--r--ext/pathname/pathname.c9
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index bf3c1efc7e..5896590495 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jul 26 22:34:37 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/pathname/pathname.c (path_taint): Pathname#taint translated from
+ pathname.rb.
+
Mon Jul 26 18:18:09 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (config.h): add include guard.
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index 56e3a4525f..3fe6c0fc18 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -208,7 +208,6 @@ class Pathname
# :startdoc:
- def taint() super; @path.taint; self end
def untaint() super; @path.untaint; self end
#
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index cba325b0dc..a66fefa53d 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -53,6 +53,14 @@ path_freeze(VALUE self)
return self;
}
+static VALUE
+path_taint(VALUE self)
+{
+ rb_call_super(0, 0);
+ OBJ_TAINT(get_strpath(self));
+ return self;
+}
+
void
Init_pathname()
{
@@ -62,4 +70,5 @@ Init_pathname()
rb_cPathname = rb_define_class("Pathname", rb_cObject);
rb_define_method(rb_cPathname, "initialize", path_initialize, 1);
rb_define_method(rb_cPathname, "freeze", path_freeze, 0);
+ rb_define_method(rb_cPathname, "taint", path_taint, 0);
}