ruby-changes:4333
From: ko1@a...
Date: Fri, 21 Mar 2008 21:27:31 +0900 (JST)
Subject: [ruby-changes:4333] nobu - Ruby:r15823 (ruby_1_8, trunk): * lib/resolv.rb (Resolv::Hosts): should not use win32/resolv on cygwin.
nobu 2008-03-21 21:27:00 +0900 (Fri, 21 Mar 2008)
New Revision: 15823
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/ext/Win32API/lib/win32/registry.rb
branches/ruby_1_8/ext/Win32API/lib/win32/resolv.rb
branches/ruby_1_8/lib/resolv.rb
trunk/ChangeLog
trunk/ext/dl/win32/lib/win32/registry.rb
trunk/ext/dl/win32/lib/win32/resolv.rb
trunk/lib/resolv.rb
Log:
* 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.
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/dl/win32/lib/win32/resolv.rb?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/resolv.rb?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/Win32API/lib/win32/resolv.rb?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ext/Win32API/lib/win32/registry.rb?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/dl/win32/lib/win32/registry.rb?r1=15823&r2=15822&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/resolv.rb?r1=15823&r2=15822&diff_format=u
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15822)
+++ ChangeLog (revision 15823)
@@ -1,3 +1,13 @@
+Fri Mar 21 21:26:52 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * 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@i...>
* lib/ipaddr.rb: Say that I am the current maintainer.
Index: lib/resolv.rb
===================================================================
--- lib/resolv.rb (revision 15822)
+++ lib/resolv.rb (revision 15823)
@@ -160,7 +160,7 @@
# 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
Index: ext/dl/win32/lib/win32/registry.rb
===================================================================
--- ext/dl/win32/lib/win32/registry.rb (revision 15822)
+++ ext/dl/win32/lib/win32/registry.rb (revision 15823)
@@ -493,7 +493,7 @@
# utility functions
#
def self.expand_environ(str)
- str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
+ str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
end
@@type2name = { }
Index: ext/dl/win32/lib/win32/resolv.rb
===================================================================
--- ext/dl/win32/lib/win32/resolv.rb (revision 15822)
+++ ext/dl/win32/lib/win32/resolv.rb (revision 15823)
@@ -11,7 +11,7 @@
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
Index: ruby_1_8/ext/Win32API/lib/win32/registry.rb
===================================================================
--- ruby_1_8/ext/Win32API/lib/win32/registry.rb (revision 15822)
+++ ruby_1_8/ext/Win32API/lib/win32/registry.rb (revision 15823)
@@ -493,7 +493,7 @@
# utility functions
#
def self.expand_environ(str)
- str.gsub(/%([^%]+)%/) { ENV[$1] || $& }
+ str.gsub(/%([^%]+)%/) { ENV[$1] || ENV[$1.upcase] || $& }
end
@@type2name = { }
Index: ruby_1_8/ext/Win32API/lib/win32/resolv.rb
===================================================================
--- ruby_1_8/ext/Win32API/lib/win32/resolv.rb (revision 15822)
+++ ruby_1_8/ext/Win32API/lib/win32/resolv.rb (revision 15823)
@@ -11,7 +11,7 @@
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
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 15822)
+++ ruby_1_8/ChangeLog (revision 15823)
@@ -1,3 +1,13 @@
+Fri Mar 21 21:26:52 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * 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@i...>
* lib/ipaddr.rb: Say that I am the current maintainer.
Index: ruby_1_8/lib/resolv.rb
===================================================================
--- ruby_1_8/lib/resolv.rb (revision 15822)
+++ ruby_1_8/lib/resolv.rb (revision 15823)
@@ -160,7 +160,7 @@
# 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
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/