diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-22 08:51:40 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-10-22 08:51:40 +0000 |
commit | 1e8e5082f848f2c74df5b47d226f3b2310ea0ca2 (patch) | |
tree | b328922b605c9e065c4600fec8c020c41ca024b7 | |
parent | fe2a0c0e80b99e3fed542aa4a6b05bd8f98ecdef (diff) | |
download | ruby-1e8e5082f848f2c74df5b47d226f3b2310ea0ca2.tar.gz ruby-1e8e5082f848f2c74df5b47d226f3b2310ea0ca2.tar.xz ruby-1e8e5082f848f2c74df5b47d226f3b2310ea0ca2.zip |
* lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
convert an integer back and forth.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | lib/fileutils.rb | 22 |
2 files changed, 19 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Oct 22 17:49:05 2009 Akinori MUSHA <knu@iDaemons.org> + + * lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not + convert an integer back and forth. + Thu Oct 22 17:29:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (arg_prepend): removed. a patch from Mikhail T. in diff --git a/lib/fileutils.rb b/lib/fileutils.rb index 58e3f1d68..8c522ced5 100644 --- a/lib/fileutils.rb +++ b/lib/fileutils.rb @@ -977,20 +977,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 |