* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.

[ruby-dev:29945], [ruby-dev:34095]

* lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
  name too for cygwin.  [ruby-dev:29945]

* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15823 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

ChangeLog

@@ -1,3 +1,13 @@
+Fri Mar 21 21:26:52 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
+	  [ruby-dev:29945], [ruby-dev:34095]
+
+	* lib/win32/registry.rb (Win32::Registry.expand_environ): try upcased
+	  name too for cygwin.  [ruby-dev:29945]
+
+	* lib/win32/resolv.rb (Win32::Resolv.get_hosts_path): use expand_path.
+
 Fri Mar 21 21:10:00 2008  Akinori MUSHA  <knu@iDaemons.org>
 
 	* lib/ipaddr.rb: Say that I am the current maintainer.

ext/dl/win32/lib/win32/registry.rb

@@ -493,7 +493,7 @@ module Win32
     # utility functions
     #
     def self.expand_environ(str)
-      str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
+      str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
     end
     
     @@type2name = { }

ext/dl/win32/lib/win32/resolv.rb

@@ -11,7 +11,7 @@ module Win32
     
     def self.get_hosts_path
       path = get_hosts_dir
-      path = File.join(path.gsub(/\\/, File::SEPARATOR), 'hosts')
+      path = File.expand_path('hosts', path)
       File.exist?(path) ? path : nil
     end
     

lib/resolv.rb

@@ -160,7 +160,7 @@ class Resolv
   # DNS::Hosts is a hostname resolver that uses the system hosts file.
 
   class Hosts
-    if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+    if /mswin32|mingw|bccwin/ =~ RUBY_PLATFORM
       require 'win32/resolv'
       DefaultFileName = Win32::Resolv.get_hosts_path
     else