From b5aef633862dbcf988075a6344084f2a8bbedca6 Mon Sep 17 00:00:00 2001 From: aamine Date: Mon, 19 Sep 2005 10:09:53 +0000 Subject: * file.c (rb_file_chown): should accept nil. [ruby-dev:27171] (backport from trunk, rev 1.208) git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9233 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ file.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35aacbf47..33addaaad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Sep 19 19:09:08 2005 Minero Aoki + + * file.c (rb_file_chown): should accept nil. [ruby-dev:27171] + (backport from trunk, rev 1.208) + Mon Sep 19 18:35:13 2005 Yukihiro Matsumoto * ext/dl/dl.c (rb_io_to_ptr): fix DragonFlyBSD support. diff --git a/file.c b/file.c index 0f35ec074..c6e7b349e 100644 --- a/file.c +++ b/file.c @@ -1747,8 +1747,8 @@ rb_file_chown(obj, owner, group) int o, g; rb_secure(2); - o = NUM2INT(owner); - g = NUM2INT(group); + o = NIL_P(owner) ? -1 : NUM2INT(owner); + g = NIL_P(group) ? -1 : NUM2INT(group); GetOpenFile(obj, fptr); #if defined(DJGPP) || defined(__CYGWIN32__) || defined(_WIN32) || defined(__EMX__) if (!fptr->path) return Qnil; -- cgit