summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/tk/lib/tk.rb22
-rw-r--r--lib/README6
-rw-r--r--lib/mkmf.rb3
-rw-r--r--lib/resolv-replace.rb41
-rw-r--r--lib/resolv.rb1346
-rw-r--r--lib/shell.rb2
-rw-r--r--misc/ruby-mode.el4
-rw-r--r--win32/dir.h20
8 files changed, 1415 insertions, 29 deletions
diff --git a/ext/tk/lib/tk.rb b/ext/tk/lib/tk.rb
index 47be8fd9745..217c76f5656 100644
--- a/ext/tk/lib/tk.rb
+++ b/ext/tk/lib/tk.rb
@@ -665,6 +665,10 @@ module TkPackage
include TkCore
extend TkPackage
+ def add_path(path)
+ Tk::AUTO_PATH.value = Tk::AUTO_PATH.to_a << path
+ end
+
def forget(package)
tk_call('package', 'forget', package)
nil
@@ -726,9 +730,6 @@ module Tk
TK_LIBRARY = INTERP._invoke("set", "tk_library")
LIBRARY = INTERP._invoke("info", "library")
- TCL_PACKAGE_PATH = INTERP._invoke("set", "tcl_pkgPath")
- AUTO_PATH = tk_split_simplelist(INTERP._invoke("set", "auto_path"))
-
PLATFORM = Hash[*tk_split_simplelist(INTERP._eval('array get tcl_platform'))]
JAPANIZED_TK = (INTERP._invoke("info", "commands", "kanji") != "")
@@ -1379,6 +1380,21 @@ class TkVarAccess<TkVariable
end
end
+module Tk
+ begin
+ auto_path = INTERP._invoke('set', 'auto_path')
+ rescue
+ begin
+ auto_path = INTERP._invoke('set', 'env(TCLLIBPATH)')
+ rescue
+ auto_path = Tk::LIBRARY
+ end
+ end
+ AUTO_PATH = TkVarAccess.new('auto_path', auto_path)
+
+ TCL_PACKAGE_PATH = TkVarAccess.new('tcl_pkgPath')
+end
+
module TkSelection
include Tk
extend Tk
diff --git a/lib/README b/lib/README
index f5dc1d6e8ea..02003d2a728 100644
--- a/lib/README
+++ b/lib/README
@@ -45,9 +45,11 @@ ping.rb checks whether host is up, using TCP echo.
profile.rb ruby profiler
pstore.rb persistent object strage using marshal
rational.rb rational number support
-readbytes.rb defines IO#readbytes
+readbytes.rb define IO#readbytes
+resolv.rb DNS resolver in Ruby
+resolv-replace.rb replace Socket DNS by resolve.rb
shell.rb runs commands and does pipeline operations like shell
-shellwords.rb splits string into words like shell
+shellwords.rb split into words like shell
singleton.rb singleton design pattern library
sync.rb 2 phase lock
telnet.rb obsolete - use net/telnet
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index e9c78dace7b..8ca32c9b6ce 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -282,8 +282,7 @@ SRC
print "no\n"
return false
end
- header.tr!("a-z./\055", "A-Z___")
- $defs.push(format("-DHAVE_%s", header))
+ $defs.push(format("-DHAVE_%s", header.tr("a-z./\055", "A-Z___")))
print "yes\n"
return true
end
diff --git a/lib/resolv-replace.rb b/lib/resolv-replace.rb
new file mode 100644
index 00000000000..ad5c97bfdfa
--- /dev/null
+++ b/lib/resolv-replace.rb
@@ -0,0 +1,41 @@
+require 'resolv'
+
+class BasicSocket
+ alias original_resolv_send send
+ def send(mesg, flags, *rest)
+ rest[0] = Resolv.getaddress(rest[0]).to_s if 0 < rest.length
+ original_resolv_send(mesg, flags, *rest)
+ end
+end
+
+class << IPSocket
+ alias original_resolv_getaddress getaddress
+ def getaddress(host)
+ return Resolv.getaddress(host).to_s
+ end
+end
+
+class << TCPSocket
+ alias original_resolv_new new
+ def new(host, service)
+ original_resolv_new(Resolv.getaddress(host).to_s, service)
+ end
+
+ alias original_resolv_open open
+ def open(host, service)
+ original_resolv_open(Resolv.getaddress(host).to_s, service)
+ end
+end
+
+class UDPSocket
+ alias original_resolv_connect connect
+ def connect(host, port)
+ original_resolv_connect(Resolv.getaddress(host).to_s, port)
+ end
+
+ alias original_resolv_send send
+ def send(mesg, flags, *rest)
+ rest[0] = Resolv.getaddress(rest[0]).to_s if 0 < rest.length
+ original_resolv_send(mesg, flags, *rest)
+ end
+end
diff --git a/lib/resolv.rb b/lib/resolv.rb
new file mode 100644
index 00000000000..782501b7ccc
--- /dev/null
+++ b/lib/resolv.rb
@@ -0,0 +1,1346 @@
+require 'socket'
+require 'fcntl'
+require 'timeout'
+require 'thread'
+
+class Resolv
+ def self.getaddress(name)
+ DefaultResolver.getaddress(name)
+ end
+
+ def self.getname(address)
+ DefaultResolver.getname(address)
+ end
+
+ def initialize(resolvers=[Hosts.new, DNS.new])
+ @resolvers = resolvers
+ end
+
+ def getaddress(name)
+ return name if AddressRegex =~ name
+ rs = @resolvers.dup
+ begin
+ r = rs.shift
+ return r.getaddress(name)
+ rescue ResolvError
+ retry unless rs.empty?
+ raise
+ end
+ end
+
+ def getname(address)
+ rs = @resolvers.dup
+ begin
+ r = rs.shift
+ return r.getname(address)
+ rescue ResolvError
+ retry unless rs.empty?
+ raise
+ end
+ end
+
+ class ResolvError < StandardError
+ end
+
+ class Hosts
+ DefaultFileName = '/etc/hosts'
+
+ def initialize(filename = DefaultFileName)
+ @filename = filename
+ @mutex = Mutex.new
+ end
+
+ def lazy_initialize
+ @mutex.synchronize {
+ unless @initialized
+ @name2addr = {}
+ @addr2name = {}
+ open(@filename) {|f|
+ f.each {|line|
+ line.sub!(/#.*/, '')
+ addr, hostname, *aliases = line.split(/\s+/)
+ next unless addr
+ @addr2name[addr] = [] unless @addr2name.include? addr
+ @addr2name[addr] << hostname
+ @addr2name[addr] += aliases
+ @name2addr[hostname] = [] unless @name2addr.include? hostname
+ @name2addr[hostname] << addr
+ aliases.each {|n|
+ @name2addr[n] = [] unless @name2addr.include? n
+ @name2addr[n] << addr
+ }
+ }
+ }
+ @name2addr.each {|name, arr| arr.reverse!}
+ @initialized = true
+ end
+ }
+ end
+
+ def getaddress(name)
+ lazy_initialize
+ if @name2addr.include?(name)
+ return @name2addr[name][0]
+ else
+ raise ResolvError.new("#{@filename} has no name: #{name}")
+ end
+ end
+
+ def getname(address)
+ lazy_initialize
+ if @addr2name.include?(address)
+ return @addr2name[address][0]
+ else
+ raise ResolvError.new("#{@filename} has no address: #{address}")
+ end
+ end
+ end
+
+ class DNS
+ # STD0013 (RFC 1035, etc.)
+ # ftp://ftp.isi.edu/in-notes/iana/assignments/dns-parameters
+
+ Port = 53
+ UDPSize = 512
+
+ def initialize(config="/etc/resolv.conf")
+ @mutex = Mutex.new
+ @config = Config.new(config)
+ end
+
+ def lazy_initialize
+ @mutex.synchronize {
+ unless @initialized
+ @config.lazy_initialize
+
+ if nameserver = @config.single?
+ @requester = Requester::ConnectedUDP.new(nameserver)
+ else
+ @requester = Requester::UnconnectedUDP.new
+ end
+
+ @initialized = true
+ end
+ }
+ end
+
+ def getaddress(name)
+ return getresource(name, Resource::IN::A).address
+ end
+
+ def getname(address)
+ case address
+ when Name
+ ptr = address
+ when IPv4::Regex
+ ptr = IPv4.create(address).to_name
+ when IPv6::Regex
+ ptr = IPv6.create(address).to_name
+ else
+ raise ResolvError.new("cannot interpret as address: #{address}")
+ end
+ return getresource(ptr, Resource::IN::PTR).name
+ end
+
+ def getresource(name, typeclass)
+ lazy_initialize
+ q = Queue.new
+ senders = {}
+ begin
+ @config.resolv(name) {|candidate, tout, nameserver|
+ msg = Message.new
+ msg.rd = 1
+ msg.add_question(candidate, typeclass)
+ unless sender = senders[[candidate, nameserver]]
+ sender = senders[[candidate, nameserver]] =
+ @requester.sender(msg, candidate, q, nameserver)
+ end
+ sender.send
+ reply = reply_name = nil
+ timeout (tout) { reply, reply_name = q.pop }
+ case reply.rcode
+ when RCode::NoError
+ return extract_resource(reply, reply_name, typeclass)
+ when RCode::NXDomain
+ raise Config::NXDomain.new(reply_name)
+ else
+ raise Config::OtherResolvError.new(reply_name)
+ end
+ }
+ ensure
+ @requester.delete(q)
+ end
+ end
+
+ def extract_resource(msg, name, typeclass)
+ n0 = Name.create(name)
+ msg.each_answer {|n, ttl, data|
+ if n0 == n
+ case data
+ when typeclass
+ return data
+ when Resource::CNAME
+ n0 = data.name
+ end
+ end
+ }
+ msg.each_answer {|n, ttl, data|
+ if n0 == n
+ case data
+ when typeclass
+ return data
+ end
+ end
+ }
+ raise ResolvError.new("DNS result has no information for #{name}")
+ end
+
+ class Requester
+ def initialize
+ @senders = {}
+ end
+
+ def delete(arg)
+ case arg
+ when Sender
+ @senders.delete_if {|k, s| s == arg }
+ when Queue
+ @senders.delete_if {|k, s| s.queue == arg }
+ else
+ raise ArgumentError.new("neither Sender or Queue: #{arg}")
+ end
+ end
+
+ class Sender
+ def initialize(data, queue)
+ @data = data
+ @queue = queue
+ end
+ attr_reader :queue
+
+ def recv(msg)
+ @queue.push([msg, @data])
+ end
+ end
+
+ class UnconnectedUDP < Requester
+ def initialize
+ super()
+ @sock = UDPSocket.new
+ @sock.fcntl(Fcntl::F_SETFD, 1)
+ @id = {}
+ @id.default = -1
+ @thread = Thread.new {
+ loop {
+ reply, from = @sock.recvfrom(UDPSize)
+ msg = begin
+ Message.decode(reply)
+ rescue DecodeError
+ STDERR.print("DNS message decoding error: #{reply.inspect}\n")
+ next
+ end
+ if s = @senders[[[from[3],from[1]],msg.id]]
+ s.recv msg
+ else
+ #STDERR.print("non-handled DNS message: #{msg.inspect} from #{from.inspect}\n")
+ end
+ }
+ }
+ end
+
+ def sender(msg, data, queue, host, port=Port)
+ service = [host, port]
+ id = Thread.exclusive {
+ @id[service] = (@id[service] + 1) & 0xffff
+ }
+ request = msg.encode
+ request[0,2] = [id].pack('n')
+ return @senders[[service, id]] =
+ Sender.new(request, data, @sock, host, port, queue)
+ end
+
+ class Sender < Requester::Sender
+ def initialize(msg, data, sock, host, port, queue)
+ super(data, queue)
+ @msg = msg
+ @sock = sock
+ @host = host
+ @port = port
+ end
+
+ def send
+ @sock.send(@msg, 0, @host, @port)
+ end
+ end
+ end
+
+ class ConnectedUDP < Requester
+ def initialize(host, port=Port)
+ super()
+ @host = host
+ @port = port
+ @sock = UDPSocket.new
+ @sock.connect(host, port)
+ @sock.fcntl(Fcntl::F_SETFD, 1)
+ @id = -1
+ @thread = Thread.new {
+ loop {
+ reply = @sock.recv(UDPSize)
+ msg = begin
+ Message.decode(reply)
+ rescue DecodeError
+ STDERR.print("DNS message decoding error: #{reply.inspect}")
+ next
+ end
+ if s = @senders[msg.id]
+ s.recv msg
+ else
+ #STDERR.print("non-handled DNS message: #{msg.inspect}")
+ end
+ }
+ }
+ end
+
+ def sender(msg, data, queue, host=@host, port=@port)
+ unless host == @host && port == @port
+ raise RequestError.new("host/port don't match: #{host}:#{port}")
+ end
+ id = Thread.exclusive { @id = (@id + 1) & 0xffff }
+ request = msg.encode
+ request[0,2] = [id].pack('n')
+ return @senders[id] = Sender.new(request, data, @sock, queue)
+ end
+
+ class Sender < Requester::Sender
+ def initialize(msg, data, sock, queue)
+ super(data, queue)
+ @msg = msg
+ @sock = sock
+ end
+
+ def send
+ @sock.send(@msg, 0)
+ end
+ end
+ end
+
+ class TCP < Requester
+ def initialize(host, port=Port)
+ super()
+ @host = host
+ @port = port
+ @sock = TCPSocket.new
+ @sock.connect(host, port)
+ @sock.fcntl(Fcntl::F_SETFD, 1)
+ @id = -1
+ @senders = {}
+ @thread = Thread.new {
+ loop {
+ len = @sock.read(2).unpack('n')
+ reply = @sock.read(len)
+ msg = begin
+ Message.decode(reply)
+ rescue DecodeError
+ STDERR.print("DNS message decoding error: #{reply.inspect}")
+ next
+ end
+ if s = @senders[msg.id]
+ s.push msg
+ else
+ #STDERR.print("non-handled DNS message: #{msg.inspect}")
+ end
+ }
+ }
+ end
+
+ def sender(msg, data, queue, host=@host, port=@port)
+ unless host == @host && port == @port
+ raise RequestError.new("host/port don't match: #{host}:#{port}")
+ end
+ id = Thread.exclusive { @id = (@id + 1) & 0xffff }
+ request = msg.encode
+ request[0,2] = [request.length, id].pack('nn')
+ return @senders[id] = Sender.new(request, data, @sock, queue)
+ end
+
+ class Sender < Requester::Sender
+ def initialize(msg, data, sock, queue)
+ super(data, queue)
+ @msg = msg
+ @sock = sock
+ end
+
+ def send
+ @sock.print(@msg)
+ @sock.flush
+ end
+ end
+ end
+
+ class RequestError < StandardError
+ end
+ end
+
+ class Config
+ def initialize(filename="/etc/resolv.conf")
+ @mutex = Mutex.new
+ @filename = filename
+ end
+
+ def lazy_initialize
+ @mutex.synchronize {
+ unless @initialized
+ @nameserver = []
+ @search = nil
+ @ndots = 1
+ begin
+ open(@filename) {|f|
+ f.each {|line|
+ line.sub!(/[#;].*/, '')
+ keyword, *args = line.split(/\s+/)
+ next unless keyword
+ case keyword
+ when 'nameserver'
+ @nameserver += args
+ when 'domain'
+ @search = [args[0]]
+ when 'search'
+ @search = args
+ end
+ }
+ }
+ rescue Errno::ENOENT
+ end
+
+ @nameserver = ['0.0.0.0'] if @nameserver.empty?
+ unless @search
+ hostname = Socket.gethostname
+ if /\./ =~ hostname
+ @search = [$']
+ else
+ @search = ['']
+ end
+ end
+ @initialized = true
+ end
+ }
+ end
+
+ def single?
+ lazy_initialize
+ if @nameserver.length == 1
+ return @nameserver[0]
+ else
+ return nil
+ end
+ end
+
+ def generate_candidates(name)
+ candidates = nil
+ name = name.to_s if Name === name
+ if /\.\z/ =~ name
+ candidates = [name]
+ elsif @ndots <= name.tr('^.', '').length
+ candidates = [name, *@search.collect {|domain| name + '.' + domain}]
+ else
+ candidates = [*@search.collect {|domain| name + '.' + domain}]
+ end
+ candidates.collect! {|c|
+ c = c.dup
+ c.gsub!(/\.\.+/, '.')
+ c.chomp!('.')
+ c
+ }
+ return candidates
+ end
+
+ InitialTimeout = 5
+
+ def generate_timeouts
+ ts = [InitialTimeout]
+ ts << ts[-1] * 2 / @nameserver.length
+ ts << ts[-1] * 2
+ ts << ts[-1] * 2
+ return ts
+ end
+
+ def resolv(name)
+ candidates = generate_candidates(name)
+ timeouts = generate_timeouts
+ begin
+ candidates.each {|candidate|
+ begin
+ timeouts.each {|tout|
+ @nameserver.each {|nameserver|
+ begin
+ yield candidate, tout, nameserver
+ rescue TimeoutError
+ end
+ }
+ }
+ raise ResolvError.new("DNS resolv timeout: #{name}")
+ rescue NXDomain
+ end
+ }
+ rescue OtherResolvError
+ raise ResolvError.new("DNS error: #{$!.message}")
+ end
+ raise ResolvError.new("DNS resolv error: #{name}")
+ end
+
+ class NXDomain < ResolvError
+ end
+
+ class OtherResolvError < ResolvError
+ end
+ end
+
+ module OpCode
+ Query = 0
+ IQuery = 1
+ Status = 2
+ Notify = 4
+ Update = 5
+ end
+
+ module RCode
+ NoError = 0
+ FormErr = 1
+ ServFail = 2
+ NXDomain = 3
+ NotImp = 4
+ Refused = 5
+ YXDomain = 6
+ YXRRSet = 7
+ NXRRSet = 8
+ NotAuth = 9
+ NotZone = 10
+ BADVERS = 16
+ BADSIG = 16
+ BADKEY = 17
+ BADTIME = 18
+ BADMODE = 19
+ BADNAME = 20
+ BADALG = 21
+ end
+
+ class DecodeError < StandardError
+ end
+
+ class EncodeError < StandardError
+ end
+
+ module Label
+ def self.split(arg)
+ labels = []
+ arg.scan(/[^\.]+/) {labels << Str.new($&)}
+ return labels
+ end
+
+ class Str
+ def initialize(string)
+ @string = string
+ @downcase = string.downcase
+ end
+ attr_reader :string, :downcase
+
+ def to_s
+ return @string
+ end
+
+ def ==(other)
+ return @downcase == other.downcase
+ end
+
+ def eql?(other)
+ return self == other
+ end
+
+ def hash
+ return @downcase.hash
+ end
+ end
+ end
+
+ class Name
+ def self.create(arg)
+ case arg
+ when Name
+ return arg
+ when String
+ return Name.new(Label.split(arg))
+ else
+ raise ArgumentError.new("cannot interprete as DNS name: #{arg.inspect}")
+ end
+ end
+
+ def initialize(labels)
+ @labels = labels
+ end
+
+ def ==(other)
+ return @labels == other.to_a
+ end
+
+ def eql?(other)
+ return self == other
+ end
+
+ def hash
+ return @labels.hash
+ end
+
+ def to_a
+ return @labels
+ end
+
+ def length
+ return @labels.length
+ end
+
+ def [](i)
+ return @labels[i]
+ end
+
+ def to_s
+ return @labels.join('.')
+ end
+ end
+
+ class Message
+ @@identifier = -1
+
+ def initialize(id = (@@identifier += 1) & 0xffff)
+ @id = id
+ @qr = 0
+ @opcode = 0
+ @aa = 0
+ @tc = 0
+ @rd = 0 # recursion desired
+ @ra = 0 # recursion available
+ @rcode = 0
+ @question = []
+ @answer = []
+ @authority = []
+ @additional = []
+ end
+
+ attr_accessor :id, :qr, :opcode, :aa, :tc, :rd, :ra, :rcode
+ attr_reader :question, :answer, :authority, :additional
+
+ def ==(other)
+ return @id == other.id &&
+ @qr == other.qr &&
+ @opcode == other.opcode &&
+ @aa == other.aa &&
+ @tc == other.tc &&
+ @rd == other.rd &&
+ @ra == other.ra &&
+ @rcode == other.rcode &&
+ @question == other.question &&
+ @answer == other.answer &&
+ @authority == other.authority &&
+ @additional == other.additional
+ end
+
+ def add_question(name, typeclass)
+ @question << [Name.create(name), typeclass]
+ end
+
+ def each_question
+ @question.each {|name, typeclass|
+ yield name, typeclass
+ }
+ end
+
+ def add_answer(name, ttl, data)
+ @answer << [Name.create(name), ttl, data]
+ end
+
+ def each_answer
+ @answer.each {|name, ttl, data|
+ yield name, ttl, data
+ }
+ end
+
+ def add_authority(name, ttl, data)
+ @authority << [Name.create(name), ttl, data]
+ end
+
+ def each_authority
+ @authority.each {|name, ttl, data|
+ yield name, ttl, data
+ }
+ end
+
+ def add_additional(name, ttl, data)
+ @additional << [Name.create(name), ttl, data]
+ end
+
+ def each_additional
+ @additional.each {|name, ttl, data|
+ yield name, ttl, data
+ }
+ end
+
+ def each_resource
+ each_answer {|name, ttl, data| yield name, ttl, data}
+ each_authority {|name, ttl, data| yield name, ttl, data}
+ each_additional {|name, ttl, data| yield name, ttl, data}
+ end
+
+ def encode
+ return MessageEncoder.new {|msg|
+ msg.put_pack('nnnnnn',
+ @id,
+ (@qr & 1) << 15 |
+ (@opcode & 15) << 11 |
+ (@aa & 1) << 10 |
+ (@tc & 1) << 9 |
+ (@rd & 1) << 8 |
+ (@ra & 1) << 7 |
+ (@rcode & 15),
+ @question.length,
+ @answer.length,
+ @authority.length,
+ @additional.length)
+ @question.each {|q|
+ name, typeclass = q
+ msg.put_name(name)
+ msg.put_pack('nn', typeclass::TypeValue, typeclass::ClassValue)
+ }
+ [@answer, @authority, @additional].each {|rr|
+ rr.each {|r|
+ name, ttl, data = r
+ msg.put_name(name)
+ msg.put_pack('nnN', data.class::TypeValue, data.class::ClassValue, ttl)
+ msg.put_length16 {data.encode_rdata(msg)}
+ }
+ }
+ }.to_s
+ end
+
+ class MessageEncoder
+ def initialize
+ @data = ''
+ @names = {}
+ yield self
+ end
+
+ def to_s
+ return @data
+ end
+
+ def put_bytes(d)
+ @data << d
+ end
+
+ def put_pack(template, *d)
+ @data << d.pack(template)
+ end
+
+ def put_length16
+ length_index = @data.length
+ @data << "\0\0"
+ data_start = @data.length
+ yield
+ data_end = @data.length
+ @data[length_index, 2] = [data_end - data_start].pack("n")
+ end
+
+ def put_string(d)
+ self.put_pack("C", d.length)
+ @data << d
+ end
+
+ def put_name(d)
+ put_labels(d.to_a)
+ end
+
+ def put_labels(d)
+ d.each_index {|i|
+ domain = d[i..-1]
+ if idx = @names[domain]
+ self.put_pack("n", 0xc000 | idx)
+ return
+ else
+ @names[domain] = @data.length
+ self.put_label(d[i])
+ end
+ }
+ @data << "\0"
+ end
+
+ def put_label(d)
+ self.put_string(d.string)
+ end
+ end
+
+ def Message.decode(m)
+ o = Message.new(0)
+ MessageDecoder.new(m) {|msg|
+ id, flag, qdcount, ancount, nscount, arcount =
+ msg.get_unpack('nnnnnn')
+ o.id = id
+ o.qr = (flag >> 15) & 1
+ o.opcode = (flag >> 11) & 15
+ o.aa = (flag >> 10) & 1
+ o.tc = (flag >> 9) & 1
+ o.rd = (flag >> 8) & 1
+ o.ra = (flag >> 7) & 1
+ o.rcode = flag & 15
+ (1..qdcount).each {
+ name, typeclass = msg.get_question
+ o.add_question(name, typeclass)
+ }
+ (1..ancount).each {
+ name, ttl, data = msg.get_rr
+ o.add_answer(name, ttl, data)
+ }
+ (1..nscount).each {
+ name, ttl, data = msg.get_rr
+ o.add_authority(name, ttl, data)
+ }
+ (1..arcount).each {
+ name, ttl, data = msg.get_rr
+ o.add_additional(name, ttl, data)
+ }
+ }
+ return o
+ end
+
+ class MessageDecoder
+ def initialize(data)
+ @data = data
+ @index = 0
+ @limit = data.length
+ yield self
+ end
+
+ def get_length16
+ len, = self.get_unpack('n')
+ save_limit = @limit
+ @limit = @index + len
+ d = yield len
+ if @index < @limit
+ raise DecodeError.new("junk exist")
+ elsif @limit < @index
+ raise DecodeError.new("limit exceed")
+ end
+ @limit = save_limit
+ return d
+ end
+
+ def get_bytes(len = @limit - @index)
+ d = @data[@index, len]
+ @index += len
+ return d
+ end
+
+ def get_unpack(template)
+ len = 0
+ template.each_byte {|byte|
+ case byte
+ when ?c, ?C
+ len += 1
+ when ?n
+ len += 2
+ when ?N
+ len += 4
+ else
+ raise StandardError.new("unsupported template: '#{byte.chr}' in '#{template}'")
+ end
+ }
+ raise DecodeError.new("limit exceed") if @limit < @index + len
+ arr = @data.unpack("@#{@index}#{template}")
+ @index += len
+ return *arr
+ end
+
+ def get_string
+ len = @data[@index]
+ raise DecodeError.new("limit exceed") if @limit < @index + 1 + len
+ d = @data[@index + 1, len]
+ @index += 1 + len
+ return d
+ end
+
+ def get_name
+ return Name.new(self.get_labels)
+ end
+
+ def get_labels(limit=nil)
+ limit = @index if !limit || @index < limit
+ d = []
+ while true
+ case @data[@index]
+ when 0
+ @index += 1
+ return d
+ when 192..255
+ idx = self.get_unpack('n')[0] & 0x3fff
+ if limit <= idx
+ raise DecodeError.new("non-backward name pointer")
+ end
+ save_index = @index
+ @index = idx
+ d += self.get_labels(limit)
+ @index = save_index
+ return d
+ else
+ d << self.get_label
+ end
+ end
+ return d
+ end
+
+ def get_label
+ return Label::Str.new(self.get_string)
+ end
+
+ def get_question
+ name = self.get_name
+ type, klass = self.get_unpack("nn")
+ return name, Resource.get_class(type, klass)
+ end
+
+ def get_rr
+ name = self.get_name
+ type, klass, ttl = self.get_unpack('nnN')
+ typeclass = Resource.get_class(type, klass)
+ return name, ttl, self.get_length16 {typeclass.decode_rdata(self)}
+ end
+ end
+ end
+
+ class Query
+ def encode_rdata(msg)
+ raise EncodeError.new("#{self.type} is query.")
+ end
+
+ def self.decode_rdata(msg)
+ raise DecodeError.new("#{self.type} is query.")
+ end
+ end
+
+ class Resource < Query
+ ClassHash = {}
+
+ def encode_rdata(msg)
+ raise NotImplementedError.new
+ end
+
+ def self.decode_rdata(msg)
+ raise NotImplementedError.new
+ end
+
+ def ==(other)
+ return self.type == other.type &&
+ self.instance_variables == other.instance_variables &&
+ self.instance_variables.collect {|name| self.instance_eval name} ==
+ other.instance_variables.collect {|name| other.instance_eval name}
+ end
+
+ def eql?(other)
+ return self == other
+ end
+
+ def hash
+ h = 0
+ self.instance_variables.each {|name|
+ h += self.instance_eval("#{name}.hash")
+ }
+ return h
+ end
+
+ def self.get_class(type_value, class_value)
+ return ClassHash[[type_value, class_value]] ||
+ Generic.create(type_value, class_value)
+ end
+
+ class Generic < Resource
+ def initialize(data)
+ @data = data
+ end
+ attr_reader :data
+
+ def encode_rdata(msg)
+ msg.put_bytes(data)
+ end
+
+ def self.decode_rdata(msg)
+ return self.new(msg.get_bytes)
+ end
+
+ def self.create(type_value, class_value)
+ c = Class.new(Generic)
+ c.const_set(:TypeValue, type_value)
+ c.const_set(:ClassValue, class_value)
+ Generic.const_set("Type#{type_value}_Class#{class_value}", c)
+ ClassHash[[type_value, class_value]] = c
+ return c
+ end
+ end
+
+ class DomainName < Resource
+ def initialize(name)
+ @name = name
+ end
+ attr_reader :name
+
+ def encode_rdata(msg)
+ msg.put_name(@name)
+ end
+
+ def self.decode_rdata(msg)
+ return self.new(msg.get_name)
+ end
+ end
+
+ # Standard (class generic) RRs
+ ClassValue = nil
+
+ class NS < DomainName
+ TypeValue = 2
+ end
+
+ class CNAME < DomainName
+ TypeValue = 5
+ end
+
+ class SOA < Resource
+ TypeValue = 6
+
+ def initialize(mname, rname, serial, refresh, retry_, expire, minimum)
+ @mname = mname
+ @rname = rname
+ @serial = serial
+ @refresh = refresh
+ @retry = retry_
+ @expire = expire
+ @minimum = minimum
+ end
+ attr_reader :mname, :rname, :serial, :refresh, :retry, :expire, :minimum
+
+ def encode_rdata(msg)
+ msg.put_name(@mname)
+ msg.put_name(@rname)
+ msg.put_pack('NNNNN', @serial, @refresh, @retry, @expire, @minimum)
+ end
+
+ def self.decode_rdata(msg)
+ mname = msg.get_name
+ rname = msg.get_name
+ serial, refresh, retry_, expire, minimum = msg.get_unpack('NNNNN')
+ return self.new(
+ mname, rname, serial, refresh, retry_, expire, minimum)
+ end
+ end
+
+ class PTR < DomainName
+ TypeValue = 12
+ end
+
+ class HINFO < Resource
+ TypeValue = 13
+
+ def initialize(cpu, os)
+ @cpu = cpu
+ @os = os
+ end
+ attr_reader :cpu, :os
+
+ def encode_rdata(msg)
+ msg.put_string(@cpu)
+ msg.put_string(@os)
+ end
+
+ def self.decode_rdata(msg)
+ cpu = msg.get_string
+ os = msg.get_string
+ return self.new(cpu, os)
+ end
+ end
+
+ class MINFO < Resource
+ TypeValue = 14
+
+ def initialize(rmailbx, emailbx)
+ @rmailbx = rmailbx
+ @emailbx = emailbx
+ end
+ attr_reader :rmailbx, :emailbx
+
+ def encode_rdata(msg)
+ msg.put_name(@rmailbx)
+ msg.put_name(@emailbx)
+ end
+
+ def self.decode_rdata(msg)
+ rmailbx = msg.get_string
+ emailbx = msg.get_string
+ return self.new(rmailbx, emailbx)
+ end
+ end
+
+ class MX < Resource
+ TypeValue= 15
+
+ def initialize(preference, exchange)
+ @preference = preference
+ @exchange = exchange
+ end
+ attr_reader :preference, :exchange
+
+ def encode_rdata(msg)
+ msg.put_pack('n', @preference)
+ msg.put_name(@exchange)
+ end
+
+ def self.decode_rdata(msg)
+ preference = msg.get_unpack('n')
+ exchange = msg.get_name
+ return self.new(preference, exchange)
+ end
+ end
+
+ class TXT < Resource
+ TypeValue = 16
+
+ def initialize(data)
+ @data = data
+ end
+ attr_reader :data
+
+ def encode_rdata(msg)
+ msg.put_string(@data)
+ end
+
+ def self.decode_rdata(msg)
+ data = msg.get_string
+ return self.new(data)
+ end
+ end
+
+ class ANY < Query
+ TypeValue = 255
+ end
+
+ ClassInsensitiveTypes = [
+ NS, CNAME, SOA, PTR, HINFO, MINFO, MX, TXT, ANY
+ ]
+
+ # ARPA Internet specific RRs
+ module IN
+ ClassValue = 1
+
+ ClassInsensitiveTypes.each {|s|
+ c = Class.new(s)
+ c.const_set(:TypeValue, s::TypeValue)
+ c.const_set(:ClassValue, ClassValue)
+ ClassHash[[s::TypeValue, ClassValue]] = c
+ self.const_set(s.name.sub(/.*::/, ''), c)
+ }
+
+ class A < Resource
+ ClassHash[[TypeValue = 1, ClassValue = ClassValue]] = self
+
+ def initialize(address)
+ @address = IPv4.create(address)
+ end
+ attr_reader :address
+
+ def encode_rdata(msg)
+ msg.put_bytes(@address.address)
+ end
+
+ def self.decode_rdata(msg)
+ return self.new(IPv4.new(msg.get_bytes(4)))
+ end
+ end
+
+ class WKS < Resource
+ ClassHash[[TypeValue = 11, ClassValue = ClassValue]] = self
+
+ def initialize(address, protocol, bitmap)
+ @address = IPv4.create(address)
+ @protocol = protocol
+ @bitmap = bitmap
+ end
+ attr_reader :address, :protocol, :bitmap
+
+ def encode_rdata(msg)
+ msg.put_bytes(@address.address)
+ msg.put_pack("n", @protocol)
+ msg.put_bytes(@bitmap)
+ end
+
+ def self.decode_rdata(msg)
+ address = IPv4.new(msg.get_bytes(4))
+ protocol = msg.get_unpack("n")
+ bitmap = msg.get_bytes
+ return self.new(address, protocol, bitmap)
+ end
+ end
+
+ class AAAA < Resource
+ ClassHash[[TypeValue = 28, ClassValue = ClassValue]] = self
+
+ def initialize(address)
+ @address = IPv6.create(address)
+ end
+ attr_reader :address
+
+ def encode_rdata(msg)
+ msg.put_bytes(@address.address)
+ end
+
+ def self.decode_rdata(msg)
+ return self.new(IPv6.new(msg.get_bytes(16)))
+ end
+ end
+ end
+ end
+ end
+
+ class IPv4
+ Regex = /\A(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
+
+ def self.create(arg)
+ case arg
+ when IPv4
+ return arg
+ when Regex
+ if (0..255) === (a = $1.to_i) &&
+ (0..255) === (b = $2.to_i) &&
+ (0..255) === (c = $3.to_i) &&
+ (0..255) === (d = $4.to_i)
+ return self.new([a, b, c, d].pack("CCCC"))
+ else
+ raise ArgumentError.new("IPv4 address with invalid value: " + arg)
+ end
+ else
+ raise ArgumentError.new("cannot interprete as IPv4 address: #{arg.inspect}")
+ end
+ end
+
+ def initialize(address)
+ unless address.kind_of?(String) && address.length == 4
+ raise ArgumentError.new('IPv4 address muse be 4 bytes')
+ end
+ @address = address
+ end
+ attr_reader :address
+
+ def to_s
+ return sprintf("%d.%d.%d.%d", *@address.unpack("CCCC"))
+ end
+
+ def to_name
+ return DNS::Name.new(
+ @address.unpack("CCCC").reverse + ['in-addr', 'arpa'])
+ end
+
+ def ==(other)
+ return @address == other.address
+ end
+
+ def eql?(other)
+ return self == other
+ end
+
+ def hash
+ return @address.hash
+ end
+ end
+
+ class IPv6
+ Regex_8Hex = /\A([0-9A-Fa-f]{1,4}:){7,7}[0-9A-Fa-f]{1,4}\z/
+ Regex_CompressedHex = /\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\z/
+ Regex_6Hex4Dec = /\A((?:[0-9A-Fa-f]{1,4}:){6,6})(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
+ Regex_CompressedHex4Dec = /\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}:)*)(\d+)\.(\d+)\.(\d+)\.(\d+)\z/
+ Regex = /(?:#{Regex_8Hex.source})|(?:#{Regex_CompressedHex.source})|(?:#{Regex_6Hex4Dec.source})|(?:#{Regex_CompressedHex4Dec.source})/
+
+ def self.create(arg)
+ case arg
+ when IPv6
+ return arg
+ when String
+ address = ''
+ if Regex_8Hex =~ arg
+ arg.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
+ elsif Regex_CompressedHex =~ arg
+ prefix = $1
+ suffix = $2
+ a1 = ''
+ a2 = ''
+ prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
+ suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
+ omitlen = 16 - a1.length - a2.length
+ address << a1 << "\0" * omitlen << a2
+ elsif Regex_6Hex4Dec =~ arg
+ prefix, a, b, c, d = $1, $2.to_i, $3.to_i, $4.to_i, $5.to_i
+ if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
+ prefix.scan(/[0-9A-Fa-f]+/) {|hex| address << [hex.hex].pack('n')}
+ address << [a, b, c, d].pack('CCCC')
+ else
+ raise ArgumentError.new("not numeric IPv6 address: " + arg)
+ end
+ elsif Regex_CompressedHex4Dec =~ arg
+ prefix, suffix, a, b, c, d = $1, $2, $3.to_i, $4.to_i, $5.to_i, $6.to_i
+ if (0..255) === a && (0..255) === b && (0..255) === c && (0..255) === d
+ a1 = ''
+ a2 = ''
+ prefix.scan(/[0-9A-Fa-f]+/) {|hex| a1 << [hex.hex].pack('n')}
+ suffix.scan(/[0-9A-Fa-f]+/) {|hex| a2 << [hex.hex].pack('n')}
+ omitlen = 12 - a1.length - a2.length
+ address << a1 << "\0" * omitlen << a2 << [a, b, c, d].pack('CCCC')
+ else
+ raise ArgumentError.new("not numeric IPv6 address: " + arg)
+ end
+ else
+ raise ArgumentError.new("not numeric IPv6 address: " + arg)
+ end
+ return IPv6.new(address)
+ else
+ raise ArgumentError.new("cannot interprete as IPv6 address: #{arg.inspect}")
+ end
+ end
+
+ def initialize(address)
+ unless address.kind_of?(String) && address.length == 16
+ raise ArgumentError.new('IPv4 address muse be 16 bytes')
+ end
+ @address = address
+ end
+ attr_reader :address
+
+ def to_s
+ address = sprintf("%X:%X:%X:%X:%X:%X:%X:%X", *@address.unpack("nnnnnnnn"))
+ unless address.sub!(/(^|:)0(:0)+(:|$)/, '::')
+ address.sub!(/(^|:)0(:|$)/, '::')
+ end
+ return address
+ end
+
+ def to_name
+ return DNS::Name.new(
+ @address.unpack("H32")[0].split(//).reverse + ['ip6', 'int'])
+ end
+
+ def ==(other)
+ return @address == other.address
+ end
+
+ def eql?(other)
+ return self == other
+ end
+
+ def hash
+ return @address.hash
+ end
+ end
+
+ DefaultResolver = self.new
+ AddressRegex = /(?:#{IPv4::Regex.source})|(?:#{IPv6::Regex})/
+end
diff --git a/lib/shell.rb b/lib/shell.rb
index 1d288342134..6b44cc3e648 100644
--- a/lib/shell.rb
+++ b/lib/shell.rb
@@ -255,7 +255,7 @@ class Shell
return unless yorn
_head = true
- print *opts.collect{|mes|
+ print opts.collect{|mes|
mes = mes.dup
yield mes if iterator?
if _head
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index a3cdff3c7a4..fcf3d535c06 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -672,7 +672,9 @@ An end of a defun is found by moving forward from the beginning of one."
("\\(#\\)[{$@]" 1 (1 . nil))
("\\(/\\)\\([^/\n]\\|\\/\\)*\\(/\\)"
(1 (7 . ?'))
- (3 (7 . ?')))))
+ (3 (7 . ?')))
+ ("^\\(=\\)begin\\(\\s \\|$\\)" 1 (7 . nil))
+ ("^\\(=\\)end\\(\\s \\|$\\)" 1 (7 . nil))))
(make-local-variable 'font-lock-defaults)
(setq font-lock-defaults '((ruby-font-lock-keywords) nil nil))
(setq font-lock-keywords ruby-font-lock-keywords)))
diff --git a/win32/dir.h b/win32/dir.h
deleted file mode 100644
index 8aa793de420..00000000000
--- a/win32/dir.h
+++ /dev/null
@@ -1,20 +0,0 @@
-struct direct
-{
- long d_namlen;
- ino_t d_ino;
- char d_name[256];
-};
-typedef struct {
- char *start;
- char *curr;
- long size;
- long nfiles;
- struct direct dirstr;
-} DIR;
-
-DIR* opendir(const char*);
-struct direct* readdir(DIR *);
-long telldir(DIR *);
-void seekdir(DIR *, long);
-void rewinddir(DIR *);
-void closedir(DIR *);