ruby-dev

Tietew です。

遅くなりましたが，win32/registry.rb の最新版＋日本語ドキュメント
と resolv.rb へのパッチ (一カ所修正漏れがあったのを追加) です。

VMWare3.0 を導入したんですけどファイル共有がおかしくて Win9x で
のテストがまだです…


—[ Tietew ]——————————————————————————
 メ : tietew@tietew.net / tietew@raug.net / tietew@masuclub.net
ホペ: http://www.tietew.net/     Tietew Windows Lab.
      http://www.masuclub.net/   鱒倶楽部
指紋: 26CB 71BB B595 09C4 0153  81C4 773C 963A D51B 8CAA

Attachments (2)

resolv.rb.diff (3.86 KB, text/x-diff)

Index: lib/resolv.rb
===================================================================
RCS file: /src/ruby/lib/resolv.rb,v
retrieving revision 1.8
diff -u -2 -r1.8 resolv.rb
--- lib/resolv.rb	2002/03/08 03:19:44	1.8
+++ lib/resolv.rb	2002/03/08 11:02:45
@@ -263,5 +263,14 @@
 
   class Hosts
-    DefaultFileName = '/etc/hosts'
+    if /cygwin|mingw|mswin32/ =~ RUBY_PLATFORM
+      require 'win32/registry'
+      Win32::Registry::HKEY_LOCAL_MACHINE.open(
+          'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters') do |reg|
+        path = reg.read_s_expand('DataBasePath')
+        DefaultFileName = File.join(path.gsub(/\\/, '/'), 'hosts')
+      end
+    else
+      DefaultFileName = '/etc/hosts'
+    end
 
     def initialize(filename = DefaultFileName)
@@ -511,5 +520,5 @@
           super()
           @sock = UDPSocket.new
-          @sock.fcntl(Fcntl::F_SETFD, 1)
+          @sock.fcntl(Fcntl::F_SETFD, 1) if Fcntl.const_defined? :F_SETFD
           @id = {}
           @id.default = -1
@@ -566,5 +575,5 @@
           @sock = UDPSocket.new
           @sock.connect(host, port)
-          @sock.fcntl(Fcntl::F_SETFD, 1)
+          @sock.fcntl(Fcntl::F_SETFD, 1) if Fcntl.const_defined? :F_SETFD
           @id = -1
           @thread = Thread.new {
@@ -617,5 +626,5 @@
           @sock = TCPSocket.new
           @sock.connect(host, port)
-          @sock.fcntl(Fcntl::F_SETFD, 1)
+          @sock.fcntl(Fcntl::F_SETFD, 1) if Fcntl.const_defined? :F_SETFD
           @id = -1
           @senders = {}
@@ -698,4 +707,7 @@
               }
             rescue Errno::ENOENT
+	      if /cygwin|mingw|mswin32/ =~ RUBY_PLATFORM
+		initialize_win32
+	      end
             end
 
@@ -712,4 +724,69 @@
           end
         }
+      end
+      
+      def initialize_win32
+        require 'win32/registry'
+
+        Win32::Registry::HKEY_LOCAL_MACHINE.open(
+            'SYSTEM\CurrentControlSet\Services\Tcpip\Parameters') do |reg|
+          begin
+            slist = reg.read_s('SearchList')
+            @search = slist.split(/,\s*/) unless slist.empty?
+          rescue Win32::Registry::Error
+          end
+          
+          if add_search = @search.nil?
+            @search = []
+            begin
+              nvdom = reg.read_s('NV Domain')
+              unless nvdom.empty?
+                @search = [ nvdom ]
+                if reg.read_i('UseDomainNameDevolution') != 0
+                  if /^[\w\d]+\./ =~ nvdom
+                    devo = $'
+                  end
+                end
+              end
+            rescue Win32::Registry::Error
+            end
+          end
+          
+          reg.open('Interfaces') do |reg|
+            reg.each_key do |iface,|
+              reg.open(iface) do |regif|
+                begin
+                  [ 'NameServer', 'DhcpNameServer' ].each do |key|
+                    ns = regif.read_s(key)
+                    unless ns.empty?
+                      ns.split(/,\s*/).each do |ns|
+                        @nameserver << ns unless @nameserver.include? ns
+                      end
+                      break
+                    end
+                  end
+                rescue Win32::Registry::Error
+                end
+                
+                if add_search
+                  begin
+                    [ 'Domain', 'DhcpDomain' ].each do |key|
+                      dom = regif.read_s(key)
+                      unless dom.empty?
+                        dom.split(/,\s*/).each do |dom|
+                          @search << dom unless @search.include? dom
+                        end
+                        break
+                      end
+                    end
+                  rescue Win32::Registry::Error
+                  end
+                end
+              end
+            end
+          end
+          @search << devo if add_search and devo
+        end
+        @search = nil if @search.empty?
       end

win32-registry.tar.gz (7.7 KB, Archive)

Thread

Prev Next

In This Thread

Prev Next