fiddle 1.0.9 → 1.1.2

data/lib/fiddle/struct.rb

@@ -13,6 +13,58 @@ module Fiddle
       CStructEntity
     end
 
+    def self.offsetof(name, members, types) # :nodoc:
+      offset = 0
+      worklist = name.split('.')
+      this_type = self
+      while search_name = worklist.shift
+        index = 0
+        member_index = members.index(search_name)
+
+        unless member_index
+          # Possibly a sub-structure
+          member_index = members.index { |member_name, _|
+            member_name == search_name
+          }
+          return unless member_index
+        end
+
+        types.each { |type, count = 1|
+          orig_offset = offset
+          if type.respond_to?(:entity_class)
+            align = type.alignment
+            type_size = type.size
+          else
+            align = PackInfo::ALIGN_MAP[type]
+            type_size = PackInfo::SIZE_MAP[type]
+          end
+
+          # Unions shouldn't advance the offset
+          if this_type.entity_class == CUnionEntity
+            type_size = 0
+          end
+
+          offset = PackInfo.align(orig_offset, align)
+
+          if worklist.empty?
+            return offset if index == member_index
+          else
+            if index == member_index
+              subtype = types[member_index]
+              members = subtype.members
+              types = subtype.types
+              this_type = subtype
+              break
+            end
+          end
+
+          offset += (type_size * count)
+          index += 1
+        }
+      end
+      nil
+    end
+
     def each
       return enum_for(__function__) unless block_given?
 
@@ -75,6 +127,10 @@ module Fiddle
     def CUnion.entity_class
       CUnionEntity
     end
+
+    def self.offsetof(name, members, types) # :nodoc:
+      0
+    end
   end
 
   # Wrapper for arrays within a struct
@@ -172,6 +228,21 @@ module Fiddle
         define_method(:to_i){ @entity.to_i }
         define_singleton_method(:types) { types }
         define_singleton_method(:members) { members }
+
+        # Return the offset of a struct member given its name.
+        # For example:
+        #
+        #     MyStruct = struct [
+        #       "int64_t i",
+        #       "char c",
+        #     ]
+        #
+        #     MyStruct.offsetof("i") # => 0
+        #     MyStruct.offsetof("c") # => 8
+        #
+        define_singleton_method(:offsetof) { |name|
+          klass.offsetof(name, members, types)
+        }
         members.each{|name|
           name = name[0] if name.is_a?(Array) # name is a nested struct
           next if method_defined?(name)

data/lib/fiddle/value.rb

@@ -6,17 +6,17 @@ module Fiddle
     def unsigned_value(val, ty)
       case ty.abs
       when TYPE_CHAR
-        [val].pack("c").unpack("C")[0]
+        [val].pack("c").unpack1("C")
       when TYPE_SHORT
-        [val].pack("s!").unpack("S!")[0]
+        [val].pack("s!").unpack1("S!")
       when TYPE_INT
-        [val].pack("i!").unpack("I!")[0]
+        [val].pack("i!").unpack1("I!")
       when TYPE_LONG
-        [val].pack("l!").unpack("L!")[0]
+        [val].pack("l!").unpack1("L!")
       else
         if defined?(TYPE_LONG_LONG) and
           ty.abs == TYPE_LONG_LONG
-          [val].pack("q").unpack("Q")[0]
+          [val].pack("q").unpack1("Q")
         else
           val
         end
@@ -26,17 +26,17 @@ module Fiddle
     def signed_value(val, ty)
       case ty.abs
       when TYPE_CHAR
-        [val].pack("C").unpack("c")[0]
+        [val].pack("C").unpack1("c")
       when TYPE_SHORT
-        [val].pack("S!").unpack("s!")[0]
+        [val].pack("S!").unpack1("s!")
       when TYPE_INT
-        [val].pack("I!").unpack("i!")[0]
+        [val].pack("I!").unpack1("i!")
       when TYPE_LONG
-        [val].pack("L!").unpack("l!")[0]
+        [val].pack("L!").unpack1("l!")
       else
         if defined?(TYPE_LONG_LONG) and
           ty.abs == TYPE_LONG_LONG
-          [val].pack("Q").unpack("q")[0]
+          [val].pack("Q").unpack1("q")
         else
           val
         end
@@ -80,11 +80,11 @@ module Fiddle
         else
           case SIZEOF_VOIDP
           when SIZEOF_LONG
-            return [arg].pack("p").unpack("l!")[0]
+            return [arg].pack("p").unpack1("l!")
           else
             if defined?(SIZEOF_LONG_LONG) and
               SIZEOF_VOIDP == SIZEOF_LONG_LONG
-              return [arg].pack("p").unpack("q")[0]
+              return [arg].pack("p").unpack1("q")
             else
               raise(RuntimeError, "sizeof(void*)?")
             end
@@ -102,10 +102,8 @@ module Fiddle
               return val.unpack('C*')
             end
           end
-          return arg
-        else
-          return arg
         end
+        return arg
       else
         if( arg.respond_to?(:to_ptr) )
           return arg.to_ptr.to_i

data/lib/fiddle/version.rb

@@ -1,3 +1,3 @@
 module Fiddle
-  VERSION = "1.0.9"
+  VERSION = "1.1.2"
 end

data/lib/fiddle.rb

@@ -58,7 +58,36 @@ module Fiddle
   #
   # See Fiddle::Handle.new for more.
   def dlopen library
-    Fiddle::Handle.new library
+    begin
+      Fiddle::Handle.new(library)
+    rescue DLError => error
+      case RUBY_PLATFORM
+      when /linux/
+        case error.message
+        when /\A(\/.+?): (?:invalid ELF header|file too short)/
+          # This may be a linker script:
+          # https://sourceware.org/binutils/docs/ld.html#Scripts
+          path = $1
+        else
+          raise
+        end
+      else
+        raise
+      end
+
+      File.open(path) do |input|
+        input.each_line do |line|
+          case line
+          when /\A\s*(?:INPUT|GROUP)\s*\(\s*([^\s,\)]+)/
+            # TODO: Should we support multiple files?
+            return dlopen($1)
+          end
+        end
+      end
+
+      # Not found
+      raise
+    end
   end
   module_function :dlopen
 
@@ -67,4 +96,8 @@ module Fiddle
   RTLD_GLOBAL = Handle::RTLD_GLOBAL # :nodoc:
   RTLD_LAZY   = Handle::RTLD_LAZY   # :nodoc:
   RTLD_NOW    = Handle::RTLD_NOW    # :nodoc:
+
+  Fiddle::Types.constants.each do |type|
+    const_set "TYPE_#{type}", Fiddle::Types.const_get(type)
+  end
 end

metadata

@@ -1,58 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: fiddle
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.2
 platform: ruby
 authors:
 - Aaron Patterson
 - SHIBATA Hiroshi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2023-11-08 00:00:00.000000000 Z
+dependencies: []
 description: A libffi wrapper for Ruby.
 email:
 - aaron@tenderlovemaking.com
@@ -65,15 +23,12 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/downloader.rb
-- bin/extlibs.rb
 - ext/fiddle/closure.c
 - ext/fiddle/closure.h
 - ext/fiddle/conversions.c
 - ext/fiddle/conversions.h
 - ext/fiddle/depend
 - ext/fiddle/extconf.rb
-- ext/fiddle/extlibs
 - ext/fiddle/fiddle.c
 - ext/fiddle/fiddle.h
 - ext/fiddle/function.c
@@ -103,7 +58,7 @@ licenses:
 - BSD-2-Clause
 metadata:
   msys2_mingw_dependencies: libffi
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -111,15 +66,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
-signing_key: 
+rubygems_version: 3.5.0.dev
+signing_key:
 specification_version: 4
 summary: A libffi wrapper for Ruby.
 test_files: []

data/bin/downloader.rb

@@ -1,331 +0,0 @@
-# Used by configure and make to download or update mirrored Ruby and GCC
-# files. This will use HTTPS if possible, falling back to HTTP.
-
-require 'fileutils'
-require 'open-uri'
-require 'pathname'
-begin
-  require 'net/https'
-rescue LoadError
-  https = 'http'
-else
-  https = 'https'
-
-  # open-uri of ruby 2.2.0 accept an array of PEMs as ssl_ca_cert, but old
-  # versions are not.  so, patching OpenSSL::X509::Store#add_file instead.
-  class OpenSSL::X509::Store
-    alias orig_add_file add_file
-    def add_file(pems)
-      Array(pems).each do |pem|
-        if File.directory?(pem)
-          add_path pem
-        else
-          orig_add_file pem
-        end
-      end
-    end
-  end
-  # since open-uri internally checks ssl_ca_cert using File.directory?,
-  # allow to accept an array.
-  class <<File
-    alias orig_directory? directory?
-    def File.directory? files
-      files.is_a?(Array) ? false : orig_directory?(files)
-    end
-  end
-end
-
-class Downloader
-  def self.https=(https)
-    @@https = https
-  end
-
-  def self.https?
-    @@https == 'https'
-  end
-
-  def self.https
-    @@https
-  end
-
-  class GNU < self
-    def self.download(name, *rest)
-      if https?
-        super("https://raw.githubusercontent.com/gcc-mirror/gcc/master/#{name}", name, *rest)
-      else
-        super("https://repo.or.cz/official-gcc.git/blob_plain/HEAD:/#{name}", name, *rest)
-      end
-    end
-  end
-
-  class RubyGems < self
-    def self.download(name, dir = nil, since = true, options = {})
-      require 'rubygems'
-      options = options.dup
-      options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/**/*.pem", File.dirname(__FILE__)))
-      super("https://rubygems.org/downloads/#{name}", name, dir, since, options)
-    end
-  end
-
-  Gems = RubyGems
-
-  class Unicode < self
-    def self.download(name, *rest)
-      super("http://www.unicode.org/Public/#{name}", name, *rest)
-    end
-  end
-
-  def self.mode_for(data)
-    /\A#!/ =~ data ? 0755 : 0644
-  end
-
-  def self.http_options(file, since)
-    options = {}
-    if since
-      case since
-      when true
-        since = (File.mtime(file).httpdate rescue nil)
-      when Time
-        since = since.httpdate
-      end
-      if since
-        options['If-Modified-Since'] = since
-      end
-    end
-    options['Accept-Encoding'] = '*' # to disable Net::HTTP::GenericRequest#decode_content
-    options
-  end
-
-  # Downloader.download(url, name, [dir, [since]])
-  #
-  # Update a file from url if newer version is available.
-  # Creates the file if the file doesn't yet exist; however, the
-  # directory where the file is being created has to exist already.
-  # The +since+ parameter can take the following values, with associated meanings:
-  #  true ::
-  #    Take the last-modified time of the current file on disk, and only download
-  #    if the server has a file that was modified later. Download unconditionally
-  #    if we don't have the file yet. Default.
-  #  +some time value+ ::
-  #    Use this time value instead of the time of modification of the file on disk.
-  #  nil ::
-  #    Only download the file if it doesn't exist yet.
-  #  false ::
-  #    always download url regardless of whether we already have a file,
-  #    and regardless of modification times. (This is essentially just a waste of
-  #    network resources, except in the case that the file we have is somehow damaged.
-  #    Please note that using this recurringly might create or be seen as a
-  #    denial of service attack.)
-  #
-  # Example usage:
-  #   download 'http://www.unicode.org/Public/UCD/latest/ucd/UnicodeData.txt',
-  #            'UnicodeData.txt', 'enc/unicode/data'
-  def self.download(url, name, dir = nil, since = true, options = {})
-    options = options.dup
-    url = URI(url)
-    dryrun = options.delete(:dryrun)
-    if name
-      file = Pathname.new(under(dir, name))
-    else
-      name = File.basename(url.path)
-    end
-    cache_save = options.delete(:cache_save) {
-      ENV["CACHE_SAVE"] != "no"
-    }
-    cache = cache_file(url, name, options.delete(:cache_dir))
-    file ||= cache
-    if since.nil? and file.exist?
-      if $VERBOSE
-        $stdout.puts "#{file} already exists"
-        $stdout.flush
-      end
-      if cache_save
-        save_cache(cache, file, name)
-      end
-      return file.to_path
-    end
-    if dryrun
-      puts "Download #{url} into #{file}"
-      return
-    end
-    if link_cache(cache, file, name, $VERBOSE)
-      return file.to_path
-    end
-    if !https? and URI::HTTPS === url
-      warn "*** using http instead of https ***"
-      url.scheme = 'http'
-      url = URI(url.to_s)
-    end
-    if $VERBOSE
-      $stdout.print "downloading #{name} ... "
-      $stdout.flush
-    end
-    begin
-      data = url.read(options.merge(http_options(file, since.nil? ? true : since)))
-    rescue OpenURI::HTTPError => http_error
-      if http_error.message =~ /^304 / # 304 Not Modified
-        if $VERBOSE
-          $stdout.puts "#{name} not modified"
-          $stdout.flush
-        end
-        return file.to_path
-      end
-      raise
-    rescue Timeout::Error
-      if since.nil? and file.exist?
-        puts "Request for #{url} timed out, using old version."
-        return file.to_path
-      end
-      raise
-    rescue SocketError
-      if since.nil? and file.exist?
-        puts "No network connection, unable to download #{url}, using old version."
-        return file.to_path
-      end
-      raise
-    end
-    mtime = nil
-    dest = (cache_save && cache && !cache.exist? ? cache : file)
-    dest.parent.mkpath
-    dest.open("wb", 0600) do |f|
-      f.write(data)
-      f.chmod(mode_for(data))
-      mtime = data.meta["last-modified"]
-    end
-    if mtime
-      mtime = Time.httpdate(mtime)
-      dest.utime(mtime, mtime)
-    end
-    if $VERBOSE
-      $stdout.puts "done"
-      $stdout.flush
-    end
-    if dest.eql?(cache)
-      link_cache(cache, file, name)
-    elsif cache_save
-      save_cache(cache, file, name)
-    end
-    return file.to_path
-  rescue => e
-    raise "failed to download #{name}\n#{e.message}: #{url}"
-  end
-
-  def self.under(dir, name)
-    dir ? File.join(dir, File.basename(name)) : name
-  end
-
-  def self.cache_file(url, name, cache_dir = nil)
-    case cache_dir
-    when false
-      return nil
-    when nil
-      cache_dir = ENV['CACHE_DIR']
-      if !cache_dir or cache_dir.empty?
-        cache_dir = ".downloaded-cache"
-      end
-    end
-    Pathname.new(cache_dir) + (name || File.basename(URI(url).path))
-  end
-
-  def self.link_cache(cache, file, name, verbose = false)
-    return false unless cache and cache.exist?
-    return true if cache.eql?(file)
-    if /cygwin/ !~ RUBY_PLATFORM or /winsymlink:nativestrict/ =~ ENV['CYGWIN']
-      begin
-        file.make_symlink(cache.relative_path_from(file.parent))
-      rescue SystemCallError
-      else
-        if verbose
-          $stdout.puts "made symlink #{name} to #{cache}"
-          $stdout.flush
-        end
-        return true
-      end
-    end
-    begin
-      file.make_link(cache)
-    rescue SystemCallError
-    else
-      if verbose
-        $stdout.puts "made link #{name} to #{cache}"
-        $stdout.flush
-      end
-      return true
-    end
-  end
-
-  def self.save_cache(cache, file, name)
-    if cache and !cache.eql?(file) and !cache.exist?
-      begin
-        file.rename(cache)
-      rescue
-      else
-        link_cache(cache, file, name)
-      end
-    end
-  end
-end
-
-Downloader.https = https.freeze
-
-if $0 == __FILE__
-  since = true
-  options = {}
-  until ARGV.empty?
-    case ARGV[0]
-    when '-d'
-      destdir = ARGV[1]
-      ARGV.shift
-    when '-p'
-      # strip directory names from the name to download, and add the
-      # prefix instead.
-      prefix = ARGV[1]
-      ARGV.shift
-    when '-e'
-      since = nil
-    when '-a'
-      since = false
-    when '-n', '--dryrun'
-      options[:dryrun] = true
-    when '--cache-dir'
-      options[:cache_dir] = ARGV[1]
-      ARGV.shift
-    when /\A--cache-dir=(.*)/m
-      options[:cache_dir] = $1
-    when /\A-/
-      abort "#{$0}: unknown option #{ARGV[0]}"
-    else
-      break
-    end
-    ARGV.shift
-  end
-  dl = Downloader.constants.find do |name|
-    ARGV[0].casecmp(name.to_s) == 0
-  end unless ARGV.empty?
-  $VERBOSE = true
-  if dl
-    dl = Downloader.const_get(dl)
-    ARGV.shift
-    ARGV.each do |name|
-      dir = destdir
-      if prefix
-        name = name.sub(/\A\.\//, '')
-        if name.start_with?(destdir+"/")
-          name = name[(destdir.size+1)..-1]
-          if (dir = File.dirname(name)) == '.'
-            dir = destdir
-          else
-            dir = File.join(destdir, dir)
-          end
-        else
-          name = File.basename(name)
-        end
-        name = "#{prefix}/#{name}"
-      end
-      dl.download(name, dir, since, options)
-    end
-  else
-    abort "usage: #{$0} url name" unless ARGV.size == 2
-    Downloader.download(ARGV[0], ARGV[1], destdir, since, options)
-  end
-end