From ba02b2d689893b4ed12b1f01bf68a46f851f2bf9 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 11:30:20 +0000 Subject: merge revision(s) 15823: * 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/branches/ruby_1_8_6@17214 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/Win32API/lib/win32/registry.rb | 2 +- ext/Win32API/lib/win32/resolv.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/Win32API/lib/win32/registry.rb b/ext/Win32API/lib/win32/registry.rb index 2671551a33..9a2f3827b7 100644 --- a/ext/Win32API/lib/win32/registry.rb +++ b/ext/Win32API/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 = { } diff --git a/ext/Win32API/lib/win32/resolv.rb b/ext/Win32API/lib/win32/resolv.rb index 6534d20760..92336fac28 100644 --- a/ext/Win32API/lib/win32/resolv.rb +++ b/ext/Win32API/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 -- cgit v1.2.3