knu	2009-10-22 17:59:07 +0900 (Thu, 22 Oct 2009)

  New Revision: 25434

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25434

  Log:
    * lib/fileutils.rb (FileUtils#fu_get_uid, fu_get_gid): Do not
      convert an integer back and forth.

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/lib/fileutils.rb

Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 25433)
+++ ruby_1_8/ChangeLog	(revision 25434)
@@ -1,3 +1,8 @@
+Thu Oct 22 17:57:53 2009  Akinori MUSHA  <knu@i...>
+
+	* 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@r...>
 
 	* parse.y (arg_prepend): removed.  a patch from Mikhail T. in
Index: ruby_1_8/lib/fileutils.rb
===================================================================
--- ruby_1_8/lib/fileutils.rb	(revision 25433)
+++ ruby_1_8/lib/fileutils.rb	(revision 25434)
@@ -975,20 +975,26 @@
 
     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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/