summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-07 09:21:37 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-08-07 09:21:37 +0000
commit49cb5a78a14584de5932637d16fbd4ee0733d9d3 (patch)
treefb28a03e49179a0f1f18ae0e2253b709378919f0
parentf6404fa6d58927e28fb24f3f66b5e3b3c5c1b0c9 (diff)
* ext/pathname/pathname.c (path_lchown): Pathname#lchown translated
from pathname.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28903 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--ext/pathname/lib/pathname.rb3
-rw-r--r--ext/pathname/pathname.c10
-rw-r--r--test/pathname/test_pathname.rb1
4 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f096ad72a1..3d55c4670d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Aug 7 18:20:41 2010 Tanaka Akira <akr@fsij.org>
+
+ * ext/pathname/pathname.c (path_lchown): Pathname#lchown translated
+ from pathname.rb.
+
Sat Aug 7 17:49:10 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* include/ruby/missing.h: moved BROKEN_CLOSE replacements from
diff --git a/ext/pathname/lib/pathname.rb b/ext/pathname/lib/pathname.rb
index ad51ed70f5..b3bc42d9a1 100644
--- a/ext/pathname/lib/pathname.rb
+++ b/ext/pathname/lib/pathname.rb
@@ -512,9 +512,6 @@ end
class Pathname # * File *
- # See <tt>File.lchown</tt>.
- def lchown(owner, group) File.lchown(owner, group, @path) end
-
# See <tt>File.fnmatch</tt>. Return +true+ if the receiver matches the given
# pattern.
def fnmatch(pattern, *args) File.fnmatch(pattern, @path, *args) end
diff --git a/ext/pathname/pathname.c b/ext/pathname/pathname.c
index 5dc846a2ed..e317e85618 100644
--- a/ext/pathname/pathname.c
+++ b/ext/pathname/pathname.c
@@ -287,6 +287,15 @@ path_chown(VALUE self, VALUE owner, VALUE group)
}
/*
+ * See <tt>File.lchown</tt>.
+ */
+static VALUE
+path_lchown(VALUE self, VALUE owner, VALUE group)
+{
+ return rb_funcall(rb_cFile, rb_intern("lchown"), 3, owner, group, get_strpath(self));
+}
+
+/*
* == Pathname
*
* Pathname represents a pathname which locates a file in a filesystem.
@@ -492,4 +501,5 @@ Init_pathname()
rb_define_method(rb_cPathname, "chmod", path_chmod, 1);
rb_define_method(rb_cPathname, "lchmod", path_lchmod, 1);
rb_define_method(rb_cPathname, "chown", path_chown, 2);
+ rb_define_method(rb_cPathname, "lchown", path_lchown, 2);
}
diff --git a/test/pathname/test_pathname.rb b/test/pathname/test_pathname.rb
index eb42aab122..c34d61f408 100644
--- a/test/pathname/test_pathname.rb
+++ b/test/pathname/test_pathname.rb
@@ -738,7 +738,6 @@ class TestPathname < Test::Unit::TestCase
File.symlink("a", "l")
path = Pathname("l")
old = path.lstat.mode
- assert_normal_exit %{ require "pathname"; Pathname("foo").lchmod(nil) }
begin
path.lchmod(0444)
rescue NotImplementedError