From bd1990bfd9bf452fae34998b414950d37f231ec4 Mon Sep 17 00:00:00 2001 From: knu Date: Thu, 22 Oct 2009 08:59:07 +0000 Subject: * lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not convert an integer back and forth. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@25434 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/fileutils.rb | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'lib') diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 35ca983bcf..5e5066ee3a 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -975,20 +975,26 @@ module FileUtils def fu_get_uid(user) #:nodoc: return nil unless user - user = user.to_s - if /\A\d+\z/ =~ user - then user.to_i - else Etc.getpwnam(user).uid + case user + when Integer + user + when /\A\d+\z/ + user.to_i + else + Etc.getpwnam(user).uid end end private_module_function :fu_get_uid def fu_get_gid(group) #:nodoc: return nil unless group - group = group.to_s - if /\A\d+\z/ =~ group - then group.to_i - else Etc.getgrnam(group).gid + case group + when Integer + group + when /\A\d+\z/ + group.to_i + else + Etc.getgrnam(group).gid end end private_module_function :fu_get_gid -- cgit v1.2.3