ruby-changes:4378
From: ko1@a...
Date: Tue, 1 Apr 2008 01:56:49 +0900 (JST)
Subject: [ruby-changes:4378] nobu - Ruby:r15869 (trunk, ruby_1_8): * lib/resolv.rb (Resolv::Config.default_config_hash): requires
nobu 2008-04-01 01:55:54 +0900 (Tue, 01 Apr 2008)
New Revision: 15869
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/lib/resolv.rb
branches/ruby_1_8/version.h
trunk/ChangeLog
trunk/ext/dl/win32/lib/win32/registry.rb
trunk/ext/dl/win32/lib/win32/resolv.rb
trunk/lib/resolv.rb
trunk/version.h
Log:
* lib/resolv.rb (Resolv::Config.default_config_hash): requires
win32/resolv to use Win32::Resolv. [ruby-dev:34138]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/dl/win32/lib/win32/resolv.rb?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/resolv.rb?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/dl/win32/lib/win32/registry.rb?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15869&r2=15868&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/lib/resolv.rb?r1=15869&r2=15868&diff_format=u
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15868)
+++ ChangeLog (revision 15869)
@@ -1,3 +1,8 @@
+Tue Apr 1 01:55:52 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * lib/resolv.rb (Resolv::Config.default_config_hash): requires
+ win32/resolv to use Win32::Resolv. [ruby-dev:34138]
+
Tue Apr 1 01:40:58 2008 Tadayoshi Funaba <tadf@d...>
* complex.c: adopted the ruby's style.
Index: lib/resolv.rb
===================================================================
--- lib/resolv.rb (revision 15868)
+++ lib/resolv.rb (revision 15869)
@@ -777,6 +777,7 @@
config_hash = Config.parse_resolv_conf(filename)
else
if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+ require 'win32/resolv'
search, nameserver = Win32::Resolv.get_resolv_info
config_hash = {}
config_hash[:nameserver] = nameserver if nameserver
Index: ext/dl/win32/lib/win32/registry.rb
===================================================================
--- ext/dl/win32/lib/win32/registry.rb (revision 15868)
+++ ext/dl/win32/lib/win32/registry.rb (revision 15869)
@@ -337,9 +337,10 @@
FormatMessageA = Win32API.new('kernel32.dll', 'FormatMessageA', 'LPLLPLP', 'L')
def initialize(code)
@code = code
- msg = "\0" * 1024
+ msg = "\0".force_encoding(Encoding::ASCII_8BIT) * 1024
len = FormatMessageA.call(0x1200, 0, code, 0, msg, 1024, 0)
- super msg[0, len].tr("\r", '').chomp
+ msg = msg[0, len].force_encoding(Encoding.find(Encoding.locale_charmap))
+ super msg.tr("\r", '').chomp
end
attr_reader :code
end
Index: ext/dl/win32/lib/win32/resolv.rb
===================================================================
--- ext/dl/win32/lib/win32/resolv.rb (revision 15868)
+++ ext/dl/win32/lib/win32/resolv.rb (revision 15869)
@@ -82,10 +82,14 @@
reg.open(iface) do |regif|
begin
[ 'NameServer', 'DhcpNameServer' ].each do |key|
- ns = regif.read_s(key)
- unless ns.empty?
- nameserver.concat(ns.split(/[,\s]\s*/))
- break
+ begin
+ ns = regif.read_s(key)
+ rescue
+ else
+ unless ns.empty?
+ nameserver.concat(ns.split(/[,\s]\s*/))
+ break
+ end
end
end
rescue Registry::Error
Index: version.h
===================================================================
--- version.h (revision 15868)
+++ version.h (revision 15869)
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-03-31"
+#define RUBY_RELEASE_DATE "2008-04-01"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080331
+#define RUBY_RELEASE_CODE 20080401
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 31
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 15868)
+++ ruby_1_8/ChangeLog (revision 15869)
@@ -1,3 +1,8 @@
+Tue Apr 1 01:55:52 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * lib/resolv.rb (Resolv::Config.default_config_hash): requires
+ win32/resolv to use Win32::Resolv. [ruby-dev:34138]
+
Sun Mar 30 07:00:32 2008 Nobuyoshi Nakada <nobu@r...>
* ext/tk/tcltklib.c: rb_hash_lookup has not been backported yet.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h (revision 15868)
+++ ruby_1_8/version.h (revision 15869)
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-03-30"
+#define RUBY_RELEASE_DATE "2008-04-01"
#define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080330
+#define RUBY_RELEASE_CODE 20080401
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 4
+#define RUBY_RELEASE_DAY 1
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/lib/resolv.rb
===================================================================
--- ruby_1_8/lib/resolv.rb (revision 15868)
+++ ruby_1_8/lib/resolv.rb (revision 15869)
@@ -785,6 +785,7 @@
config_hash = Config.parse_resolv_conf(filename)
else
if /mswin32|cygwin|mingw|bccwin/ =~ RUBY_PLATFORM
+ require 'win32/resolv'
search, nameserver = Win32::Resolv.get_resolv_info
config_hash = {}
config_hash[:nameserver] = nameserver if nameserver
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/