ffi 1.14.0-java → 1.15.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1ab4d534f9cb242444b3ec7042f1b368b8e3d71f54f9503c831b3fa49da5d1b
-  data.tar.gz: 57ba63261c35e46d782160767a6b8239152f5978d5cc2ef66cde3ee76c3974e4
+  metadata.gz: 9d83a2eea3ece55e5206d91feeba015ade7d7de9a08e2a370bdd224b54e3a01e
+  data.tar.gz: e80594cb4748e07c525b24c1ac3732d55b459732ac037f03c802e947134aabd2
 SHA512:
-  metadata.gz: 044cbed458a7b7fa99ee830a7db1c708cfad04da10b62d28c2f1189e6c251f80c02e614e98fc98c9ab1bac3ffce895eb72bc4114291e648ac698781b694bd99a
-  data.tar.gz: 007624f31a236f1658a957835b377d62bafce078a1a0f19cdffa176a8630db36e8e1c6eefd59ed72ac7266a04d3da2be9519c833073b19f9aa9aad64dba10f1c
+  metadata.gz: 66cd6f4984f41ecc4608ebe891b3a2de0f9667eb7cf65e35ed395cff03849c2e0b55fb06a88b682b12651209eb683760bdc0e70fec0f70589c3adbf8694975ea
+  data.tar.gz: fdd77cd447e3718c01809d259c4257f3fcb90eb534a84c9bf764d7871ffbd10b215eee5f23169e7afd7194228af47de9a341440e18df744c8cf3c1e01cbb06bf

data/CHANGELOG.md

@@ -1,3 +1,61 @@
+1.15.2 / 2021-06-16
+-------------------
+
+Added:
+* Add support for Windows MINGW-UCRT build. #903
+* Add `/opt/homebrew/lib/` to fallback search paths to improve homebrew support. #880 #882
+
+Changed:
+* Regenerate `types.conf` for FreeBSD12 aarch64. #902
+
+
+1.15.1 / 2021-05-22
+-------------------
+
+Fixed:
+* Append -pthread to linker options. #893
+* Use arm or aarch64 to identify Apple ARM CPU arch. #899
+* Allow overriding `gcc` with the `CC` env var in `const_generator.rb` and `struct_generator.rb`. #897
+
+
+1.15.0 / 2021-03-05
+-------------------
+
+Fixed:
+* Fix MSVC build
+* Fix async callbacks in conjunction with fork(). #884
+
+Added:
+* Allow to pass callbacks in varargs. #885
+* Name the threads for FFI callback dispatcher and async thread calls for easier debugging. #883
+  The name can be retrieved by Thread.name and is shown by Thread.list.inspect etc.
+  Even gdb shows the thread name on supported operating systems.
+* Add types.conf for powerpc64le-linux
+* Add types.conf for riscv64-linux
+* More release automation of ffi gems
+
+Changed:
+* Switch from rubygems-tasks to bundler/gem_helper
+
+Removed:
+* Remove unused VariadicInvoker#init
+
+
+1.14.2 / 2020-12-21
+-------------------
+
+Fixed:
+* Fix builtin libffi on newer Ubuntu caused by an outdated Makefile.in . #863
+
+
+1.14.1 / 2020-12-19
+-------------------
+
+Changed:
+* Revert changes to FFI::Pointer#write_string made in ffi-1.14.0.
+  It breaks compatibilty in a way that can cause hard to find errors. #857
+
+
 1.14.0 / 2020-12-18
 -------------------
 
@@ -21,6 +79,7 @@ Fixed:
 * Fix memory leak in MethodHandle . #815
 * Fix possible segfault in combination with fiddle or other libffi using gems . #835
 * Fix possibility to use ffi ruby gem with JRuby-9.3 . #763
+* Fix a GC issue, when a callback Proc is used on more than 2 callback signatures. #820
 
 
 1.13.1 / 2020-06-09

data/Gemfile

@@ -5,10 +5,7 @@ group :development do
   gem 'rake-compiler', '~> 1.0.3'
   gem 'rake-compiler-dock', '~> 1.0'
   gem 'rspec', '~> 3.0'
-  # irb is a dependency of rubygems-tasks 0.2.5.
-  # irb versions > 1.1.1 depend on reline,
-  # which sometimes causes 'bundle install' to fail on Ruby <= 2.4: https://github.com/rubygems/rubygems/issues/3463
-  gem 'rubygems-tasks', '>= 0.2', '< 0.2.5', :require => 'rubygems/tasks'
+  gem 'bundler', '>= 1.16', '< 3'
 end
 
 group :doc do

data/README.md

@@ -62,6 +62,10 @@ On JRuby and TruffleRuby, there are no requirements to install the FFI gem, and
 From rubygems:
 
     [sudo] gem install ffi
+    
+From a Gemfile using git or GitHub
+
+    gem 'ffi', github: 'ffi/ffi', submodules: true
 
 or from the git repository on github:
 

data/Rakefile

@@ -1,20 +1,17 @@
-require 'rubygems/tasks'
 require 'rbconfig'
-require 'rake/clean'
-require_relative "lib/ffi/version"
-
 require 'date'
 require 'fileutils'
 require 'rbconfig'
 require 'rspec/core/rake_task'
 require 'rubygems/package_task'
+require 'rake/extensiontask'
+require_relative "lib/ffi/version"
+require_relative "rakelib/ffi_gem_helper"
 
 BUILD_DIR = "build"
 BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
 
-def gem_spec
-  @gem_spec ||= Gem::Specification.load('ffi.gemspec')
-end
+gem_spec = Bundler.load_gemspec('ffi.gemspec')
 
 RSpec::Core::RakeTask.new(:spec => :compile) do |config|
   config.rspec_opts = YAML.load_file 'spec/spec.opts'
@@ -37,6 +34,13 @@ CLEAN.include "pkg/ffi-*-{mingw32,java}"
 CLEAN.include 'lib/1.*'
 CLEAN.include 'lib/2.*'
 
+# clean all shipped files, that are not in git
+CLEAN.include(
+    gem_spec.files -
+    `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0").map { |f| File.join("ext/ffi_c/libffi", f) } -
+    `git ls-files -z`.split("\x0")
+)
+
 task :distclean => :clobber
 
 desc "Test the extension"
@@ -80,6 +84,10 @@ end
 
 task 'gem:java' => 'java:gem'
 
+FfiGemHelper.install_tasks
+# Register windows gems to be pushed to rubygems.org
+Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw32]
+
 if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   require 'rake/extensiontask'
   Rake::ExtensionTask.new('ffi_c', gem_spec) do |ext|
@@ -87,21 +95,11 @@ if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
     # ext.lib_dir = BUILD_DIR                                 # put binaries into this folder.
     ext.tmp_dir = BUILD_DIR                                   # temporary folder used during compilation.
     ext.cross_compile = true                                  # enable cross compilation (requires cross compile toolchain)
-    ext.cross_platform = %w[i386-mingw32 x64-mingw32]                     # forces the Windows platform instead of the default one
+    ext.cross_platform = Bundler::GemHelper.instance.cross_platforms
     ext.cross_compiling do |spec|
       spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
     end
-  end
 
-  # To reduce the gem file size strip mingw32 dlls before packaging
-  ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
-    task "build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
-      sh "i686-w64-mingw32-strip -S build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
-    end
-
-    task "build/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
-      sh "x86_64-w64-mingw32-strip -S build/x64-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
-    end
   end
 else
   task :compile do
@@ -109,6 +107,7 @@ else
   end
 end
 
+
 desc "build a windows gem without all the ceremony"
 task "gem:windows" do
   require "rake_compiler_dock"
@@ -125,7 +124,7 @@ task :libffi => "ext/ffi_c/libffi/autogen.sh"
 
 LIBFFI_GIT_FILES = `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0")
 
-# Generate files in gemspec but not in libffi's git repo by running autogen.sh
+# Generate files which are in the gemspec but not in libffi's git repo by running autogen.sh
 gem_spec.files.select do |f|
   f =~ /ext\/ffi_c\/libffi\/(.*)/ && !LIBFFI_GIT_FILES.include?($1)
 end.each do |f|
@@ -141,6 +140,11 @@ end.each do |f|
   end
 end
 
+# Make sure we have all gemspec files before packaging
+task :build => gem_spec.files
+task :gem => :build
+
+
 require_relative "lib/ffi/platform"
 types_conf = File.expand_path(File.join(FFI::Platform::CONF_DIR, 'types.conf'))
 logfile = File.join(File.dirname(__FILE__), 'types_log')
@@ -161,10 +165,6 @@ end
 desc "Create or update type information for platform #{FFI::Platform::NAME}"
 task :types_conf => types_conf
 
-Gem::Tasks.new do |t|
-  t.scm.tag.format = '%s'
-end
-
 begin
   require 'yard'
 

data/lib/ffi.rb

@@ -1,5 +1,4 @@
-if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
-  Object.send(:remove_const, :FFI) if defined?(::FFI)
+if RUBY_ENGINE == 'ruby'
   begin
     require RUBY_VERSION.split('.')[0, 2].join('.') + '/ffi_c'
   rescue Exception

data/lib/ffi/autopointer.rb

@@ -117,7 +117,7 @@ module FFI
     end
 
     # @abstract Base class for {AutoPointer}'s releasers.
-    #  
+    #
     #  All subclasses of Releaser should define a +#release(ptr)+ method.
     # A releaser is an object in charge of release an {AutoPointer}.
     class Releaser

data/lib/ffi/io.rb

@@ -29,7 +29,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.#
 
 module FFI
-  
+
   # This module implements a couple of class methods to play with IO.
   module IO
     # @param [Integer] fd file decriptor
@@ -42,12 +42,12 @@ module FFI
 
     # @param [#read] io io to read from
     # @param [AbstractMemory] buf destination for data read from +io+
-    # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+, 
+    # @param [nil, Numeric] len maximul number of bytes to read from +io+. If +nil+,
     #  read until end of file.
     # @return [Numeric] length really read, in bytes
     #
     # A version of IO#read that reads data from an IO and put then into a native buffer.
-    # 
+    #
     # This will be optimized at some future time to eliminate the double copy.
     #
     def self.native_read(io, buf, len)

data/lib/ffi/library.rb

@@ -126,7 +126,7 @@ module FFI
               else
                 # TODO better library lookup logic
                 unless libname.start_with?("/") || FFI::Platform.windows?
-                  path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/'].find do |pth|
+                  path = ['/usr/lib/','/usr/local/lib/','/opt/local/lib/', '/opt/homebrew/lib/'].find do |pth|
                     File.exist?(pth + libname)
                   end
                   if path

data/lib/ffi/managedstruct.rb

@@ -44,7 +44,7 @@ module FFI
   #    attach_function :new_dlist, [], :pointer
   #    attach_function :destroy_dlist, [:pointer], :void
   #  end
-  #  
+  #
   #  class DoublyLinkedList < FFI::ManagedStruct
   #    @@@
   #    struct do |s|
@@ -71,7 +71,7 @@ module FFI
 
     # @overload initialize(pointer)
     #  @param [Pointer] pointer
-    #  Create a new ManagedStruct which will invoke the class method #release on 
+    #  Create a new ManagedStruct which will invoke the class method #release on
     # @overload initialize
     # A new instance of FFI::ManagedStruct.
     def initialize(pointer=nil)

data/lib/ffi/platform.rb

@@ -132,11 +132,8 @@ module FFI
     end
 
     LIBC = if IS_WINDOWS
-      if RbConfig::CONFIG['host_os'] =~ /mingw/i
-        RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
-      else
-        "ucrtbase.dll"
-      end
+      crtname = RbConfig::CONFIG["RUBY_SO_NAME"][/msvc\w+/] || 'ucrtbase'
+      "#{crtname}.dll"
     elsif IS_GNU
       GNU_LIBC
     elsif OS == 'cygwin'

data/lib/ffi/platform/aarch64-freebsd/types.conf

@@ -39,9 +39,9 @@ rbx.platform.typedef.__segsz_t = int
 rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
 rbx.platform.typedef.__ssize_t = long
-rbx.platform.typedef.__suseconds_t = int
+rbx.platform.typedef.__suseconds_t = long
 rbx.platform.typedef.__swblk_t = int
-rbx.platform.typedef.__time_t = int
+rbx.platform.typedef.__time_t = long
 rbx.platform.typedef.__timer_t = int
 rbx.platform.typedef.__uid_t = uint
 rbx.platform.typedef.__uint16_t = ushort

data/lib/ffi/platform/aarch64-freebsd12/types.conf

@@ -1,128 +1,181 @@
+rbx.platform.typedef.*) = pointer
+rbx.platform.typedef.___wchar_t = uint
+rbx.platform.typedef.__accmode_t = int
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__char16_t = ushort
+rbx.platform.typedef.__char32_t = uint
 rbx.platform.typedef.__clock_t = int
 rbx.platform.typedef.__clockid_t = int
-rbx.platform.typedef.__cpuid_t = ulong
-rbx.platform.typedef.__dev_t = ulong_long
-rbx.platform.typedef.__fd_mask = int
+rbx.platform.typedef.__cpulevel_t = int
+rbx.platform.typedef.__cpusetid_t = int
+rbx.platform.typedef.__cpuwhich_t = int
+rbx.platform.typedef.__critical_t = long
+rbx.platform.typedef.__ct_rune_t = int
+rbx.platform.typedef.__daddr_t = long
+rbx.platform.typedef.__dev_t = ulong
+rbx.platform.typedef.__fd_mask = ulong
+rbx.platform.typedef.__fflags_t = uint
 rbx.platform.typedef.__fixpt_t = uint
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
 rbx.platform.typedef.__gid_t = uint
-rbx.platform.typedef.__id_t = uint
-rbx.platform.typedef.__in_addr_t = uint
-rbx.platform.typedef.__in_port_t = ushort
-rbx.platform.typedef.__ino_t = ulong_long
+rbx.platform.typedef.__id_t = long
+rbx.platform.typedef.__ino_t = ulong
 rbx.platform.typedef.__int16_t = short
 rbx.platform.typedef.__int32_t = int
-rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__int64_t = long
 rbx.platform.typedef.__int8_t = char
 rbx.platform.typedef.__int_fast16_t = int
 rbx.platform.typedef.__int_fast32_t = int
-rbx.platform.typedef.__int_fast64_t = long_long
+rbx.platform.typedef.__int_fast64_t = long
 rbx.platform.typedef.__int_fast8_t = int
 rbx.platform.typedef.__int_least16_t = short
 rbx.platform.typedef.__int_least32_t = int
-rbx.platform.typedef.__int_least64_t = long_long
+rbx.platform.typedef.__int_least64_t = long
 rbx.platform.typedef.__int_least8_t = char
-rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__intfptr_t = long
+rbx.platform.typedef.__intmax_t = long
 rbx.platform.typedef.__intptr_t = long
 rbx.platform.typedef.__key_t = long
-rbx.platform.typedef.__mode_t = uint
-rbx.platform.typedef.__nlink_t = ulong_long
-rbx.platform.typedef.__off_t = long_long
-rbx.platform.typedef.__paddr_t = ulong
+rbx.platform.typedef.__lwpid_t = int
+rbx.platform.typedef.__mode_t = ushort
+rbx.platform.typedef.__nl_item = int
+rbx.platform.typedef.__nlink_t = ulong
+rbx.platform.typedef.__off64_t = long
+rbx.platform.typedef.__off_t = long
 rbx.platform.typedef.__pid_t = int
-rbx.platform.typedef.__psize_t = ulong
 rbx.platform.typedef.__ptrdiff_t = long
-rbx.platform.typedef.__register_t = long_long
-rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__register_t = long
+rbx.platform.typedef.__rlim_t = long
+rbx.platform.typedef.__rman_res_t = ulong
 rbx.platform.typedef.__rune_t = int
 rbx.platform.typedef.__sa_family_t = uchar
-rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__segsz_t = long
 rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
 rbx.platform.typedef.__ssize_t = long
-rbx.platform.typedef.__suseconds_t = int
-rbx.platform.typedef.__swblk_t = int
-rbx.platform.typedef.__time_t = int
-rbx.platform.typedef.__timer_t = int
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__u_register_t = ulong
 rbx.platform.typedef.__uid_t = uint
 rbx.platform.typedef.__uint16_t = ushort
 rbx.platform.typedef.__uint32_t = uint
-rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__uint64_t = ulong
 rbx.platform.typedef.__uint8_t = uchar
 rbx.platform.typedef.__uint_fast16_t = uint
 rbx.platform.typedef.__uint_fast32_t = uint
-rbx.platform.typedef.__uint_fast64_t = ulong_long
+rbx.platform.typedef.__uint_fast64_t = ulong
 rbx.platform.typedef.__uint_fast8_t = uint
 rbx.platform.typedef.__uint_least16_t = ushort
 rbx.platform.typedef.__uint_least32_t = uint
-rbx.platform.typedef.__uint_least64_t = ulong_long
+rbx.platform.typedef.__uint_least64_t = ulong
 rbx.platform.typedef.__uint_least8_t = uchar
-rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__uintfptr_t = ulong
+rbx.platform.typedef.__uintmax_t = ulong
 rbx.platform.typedef.__uintptr_t = ulong
 rbx.platform.typedef.__useconds_t = uint
-rbx.platform.typedef.__vaddr_t = ulong
-rbx.platform.typedef.__vsize_t = ulong
-rbx.platform.typedef.__wchar_t = int
-rbx.platform.typedef.__wctrans_t = pointer
-rbx.platform.typedef.__wctype_t = pointer
+rbx.platform.typedef.__vm_offset_t = ulong
+rbx.platform.typedef.__vm_paddr_t = ulong
+rbx.platform.typedef.__vm_size_t = ulong
 rbx.platform.typedef.__wint_t = int
+rbx.platform.typedef.accmode_t = int
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.c_caddr_t = pointer
 rbx.platform.typedef.caddr_t = string
+rbx.platform.typedef.cap_ioctl_t = ulong
 rbx.platform.typedef.clock_t = int
 rbx.platform.typedef.clockid_t = int
-rbx.platform.typedef.cpuid_t = ulong
-rbx.platform.typedef.daddr32_t = int
-rbx.platform.typedef.daddr64_t = long_long
-rbx.platform.typedef.daddr_t = int
-rbx.platform.typedef.dev_t = ulong_long
+rbx.platform.typedef.cpulevel_t = int
+rbx.platform.typedef.cpusetid_t = int
+rbx.platform.typedef.cpuwhich_t = int
+rbx.platform.typedef.critical_t = long
+rbx.platform.typedef.daddr_t = long
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.fd_mask = ulong
+rbx.platform.typedef.fflags_t = uint
 rbx.platform.typedef.fixpt_t = uint
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
 rbx.platform.typedef.gid_t = uint
-rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.id_t = long
 rbx.platform.typedef.in_addr_t = uint
 rbx.platform.typedef.in_port_t = ushort
-rbx.platform.typedef.ino_t = ulong_long
+rbx.platform.typedef.ino_t = ulong
 rbx.platform.typedef.int16_t = short
 rbx.platform.typedef.int32_t = int
-rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int64_t = long
 rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.int_fast16_t = int
+rbx.platform.typedef.int_fast32_t = int
+rbx.platform.typedef.int_fast64_t = long
+rbx.platform.typedef.int_fast8_t = int
+rbx.platform.typedef.int_least16_t = short
+rbx.platform.typedef.int_least32_t = int
+rbx.platform.typedef.int_least64_t = long
+rbx.platform.typedef.int_least8_t = char
+rbx.platform.typedef.intmax_t = long
 rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = long
-rbx.platform.typedef.mode_t = uint
-rbx.platform.typedef.nlink_t = ulong_long
-rbx.platform.typedef.off_t = long_long
-rbx.platform.typedef.paddr_t = ulong
+rbx.platform.typedef.kpaddr_t = ulong
+rbx.platform.typedef.ksize_t = ulong
+rbx.platform.typedef.kssize_t = long
+rbx.platform.typedef.kvaddr_t = ulong
+rbx.platform.typedef.lwpid_t = int
+rbx.platform.typedef.mode_t = ushort
+rbx.platform.typedef.nlink_t = ulong
+rbx.platform.typedef.off64_t = long
+rbx.platform.typedef.off_t = long
 rbx.platform.typedef.pid_t = int
-rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.pthread_key_t = int
+rbx.platform.typedef.ptrdiff_t = long
 rbx.platform.typedef.qaddr_t = pointer
-rbx.platform.typedef.quad_t = long_long
-rbx.platform.typedef.register_t = long_long
-rbx.platform.typedef.rlim_t = ulong_long
+rbx.platform.typedef.quad_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = long
+rbx.platform.typedef.rman_res_t = ulong
+rbx.platform.typedef.rsize_t = ulong
+rbx.platform.typedef.rune_t = int
 rbx.platform.typedef.sa_family_t = uchar
-rbx.platform.typedef.segsz_t = int
+rbx.platform.typedef.sbintime_t = long
+rbx.platform.typedef.segsz_t = long
 rbx.platform.typedef.size_t = ulong
 rbx.platform.typedef.socklen_t = uint
 rbx.platform.typedef.ssize_t = long
-rbx.platform.typedef.suseconds_t = int
-rbx.platform.typedef.swblk_t = int
-rbx.platform.typedef.time_t = int
-rbx.platform.typedef.timer_t = int
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
 rbx.platform.typedef.u_char = uchar
 rbx.platform.typedef.u_int = uint
 rbx.platform.typedef.u_int16_t = ushort
 rbx.platform.typedef.u_int32_t = uint
-rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.u_int64_t = ulong
 rbx.platform.typedef.u_int8_t = uchar
 rbx.platform.typedef.u_long = ulong
-rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.u_quad_t = ulong
+rbx.platform.typedef.u_register_t = ulong
 rbx.platform.typedef.u_short = ushort
 rbx.platform.typedef.uid_t = uint
 rbx.platform.typedef.uint = uint
 rbx.platform.typedef.uint16_t = ushort
 rbx.platform.typedef.uint32_t = uint
-rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.uint64_t = ulong
 rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uint_fast16_t = uint
+rbx.platform.typedef.uint_fast32_t = uint
+rbx.platform.typedef.uint_fast64_t = ulong
+rbx.platform.typedef.uint_fast8_t = uint
+rbx.platform.typedef.uint_least16_t = ushort
+rbx.platform.typedef.uint_least32_t = uint
+rbx.platform.typedef.uint_least64_t = ulong
+rbx.platform.typedef.uint_least8_t = uchar
+rbx.platform.typedef.uintmax_t = ulong
 rbx.platform.typedef.uintptr_t = ulong
-rbx.platform.typedef.ulong = ulong
-rbx.platform.typedef.unchar = uchar
 rbx.platform.typedef.useconds_t = uint
 rbx.platform.typedef.ushort = ushort
-rbx.platform.typedef.vaddr_t = ulong
-rbx.platform.typedef.vsize_t = ulong
+rbx.platform.typedef.vm_offset_t = ulong
+rbx.platform.typedef.vm_ooffset_t = ulong
+rbx.platform.typedef.vm_paddr_t = ulong
+rbx.platform.typedef.vm_pindex_t = ulong
+rbx.platform.typedef.vm_size_t = ulong
+rbx.platform.typedef.wchar_t = uint

data/lib/ffi/platform/powerpc64le-linux/types.conf

@@ -0,0 +1,100 @@
+rbx.platform.typedef.*__caddr_t = char
+rbx.platform.typedef.*__qaddr_t = long
+rbx.platform.typedef.__blkcnt64_t = long
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = long
+rbx.platform.typedef.__clock_t = long
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__daddr_t = int
+rbx.platform.typedef.__dev_t = ulong
+rbx.platform.typedef.__fd_mask = long
+rbx.platform.typedef.__fsblkcnt64_t = ulong
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt64_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__ino64_t = ulong
+rbx.platform.typedef.__ino_t = ulong
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__key_t = int
+rbx.platform.typedef.__loff_t = long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = ulong
+rbx.platform.typedef.__off64_t = long
+rbx.platform.typedef.__off_t = long
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__priority_which_t = int
+rbx.platform.typedef.__quad_t = long
+rbx.platform.typedef.__rlim64_t = ulong
+rbx.platform.typedef.__rlim_t = ulong
+rbx.platform.typedef.__rlimit_resource_t = int
+rbx.platform.typedef.__rusage_who_t = int
+rbx.platform.typedef.__sig_atomic_t = int
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__swblk_t = long
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__timer_t = pointer
+rbx.platform.typedef.__u_char = uchar
+rbx.platform.typedef.__u_int = uint
+rbx.platform.typedef.__u_long = ulong
+rbx.platform.typedef.__u_quad_t = ulong
+rbx.platform.typedef.__u_short = ushort
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.fd_mask = long
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.ino_t = ulong
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.loff_t = long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = ulong
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.pthread_key_t = uint
+rbx.platform.typedef.pthread_once_t = int
+rbx.platform.typedef.pthread_t = ulong
+rbx.platform.typedef.quad_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.sa_family_t = ushort
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.timer_t = pointer
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_quad_t = ulong
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.ushort = ushort

data/lib/ffi/platform/riscv64-linux/types.conf

@@ -0,0 +1,104 @@
+rbx.platform.typedef.*__caddr_t = char
+rbx.platform.typedef.*__qaddr_t = long
+rbx.platform.typedef.__blkcnt64_t = long
+rbx.platform.typedef.__blkcnt_t = long
+rbx.platform.typedef.__blksize_t = int
+rbx.platform.typedef.__clock_t = long
+rbx.platform.typedef.__clockid_t = int
+rbx.platform.typedef.__daddr_t = int
+rbx.platform.typedef.__dev_t = ulong
+rbx.platform.typedef.__fd_mask = long
+rbx.platform.typedef.__fsblkcnt64_t = ulong
+rbx.platform.typedef.__fsblkcnt_t = ulong
+rbx.platform.typedef.__fsfilcnt64_t = ulong
+rbx.platform.typedef.__fsfilcnt_t = ulong
+rbx.platform.typedef.__fsword_t = long
+rbx.platform.typedef.__gid_t = uint
+rbx.platform.typedef.__id_t = uint
+rbx.platform.typedef.__ino64_t = ulong
+rbx.platform.typedef.__ino_t = ulong
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__intptr_t = long
+rbx.platform.typedef.__key_t = int
+rbx.platform.typedef.__loff_t = long
+rbx.platform.typedef.__mode_t = uint
+rbx.platform.typedef.__nlink_t = uint
+rbx.platform.typedef.__off64_t = long
+rbx.platform.typedef.__off_t = long
+rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__priority_which_t = int
+rbx.platform.typedef.__quad_t = long
+rbx.platform.typedef.__rlim64_t = ulong
+rbx.platform.typedef.__rlim_t = ulong
+rbx.platform.typedef.__rlimit_resource_t = int
+rbx.platform.typedef.__rusage_who_t = int
+rbx.platform.typedef.__sig_atomic_t = int
+rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__suseconds_t = long
+rbx.platform.typedef.__syscall_slong_t = long
+rbx.platform.typedef.__syscall_ulong_t = ulong
+rbx.platform.typedef.__time_t = long
+rbx.platform.typedef.__timer_t = pointer
+rbx.platform.typedef.__u_char = uchar
+rbx.platform.typedef.__u_int = uint
+rbx.platform.typedef.__u_long = ulong
+rbx.platform.typedef.__u_quad_t = ulong
+rbx.platform.typedef.__u_short = ushort
+rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__useconds_t = uint
+rbx.platform.typedef.blkcnt_t = long
+rbx.platform.typedef.blksize_t = int
+rbx.platform.typedef.clock_t = long
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.dev_t = ulong
+rbx.platform.typedef.fd_mask = long
+rbx.platform.typedef.fsblkcnt_t = ulong
+rbx.platform.typedef.fsfilcnt_t = ulong
+rbx.platform.typedef.gid_t = uint
+rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.ino_t = ulong
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.key_t = int
+rbx.platform.typedef.loff_t = long
+rbx.platform.typedef.mode_t = uint
+rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.off_t = long
+rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.pthread_key_t = uint
+rbx.platform.typedef.pthread_once_t = int
+rbx.platform.typedef.pthread_t = ulong
+rbx.platform.typedef.quad_t = long
+rbx.platform.typedef.register_t = long
+rbx.platform.typedef.rlim_t = ulong
+rbx.platform.typedef.sa_family_t = ushort
+rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
+rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = long
+rbx.platform.typedef.time_t = long
+rbx.platform.typedef.timer_t = pointer
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_quad_t = ulong
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.ushort = ushort

data/lib/ffi/pointer.rb

@@ -52,7 +52,7 @@ module FFI
 
     # @param [nil,Numeric] len length of string to return
     # @return [String]
-    # Read pointer's contents as a string, or the first +len+ bytes of the 
+    # Read pointer's contents as a string, or the first +len+ bytes of the
     # equivalent string if +len+ is not +nil+.
     def read_string(len=nil)
       if len
@@ -85,37 +85,23 @@ module FFI
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +len+ first bytes of +str+ in pointer's contents and a final \0 byte.
+    # Write +len+ first bytes of +str+ in pointer's contents.
     #
     # Same as:
     #  ptr.write_string(str, len)   # with len not nil
     def write_string_length(str, len)
-      write_string(str, len)
+      put_bytes(0, str, 0, len)
     end unless method_defined?(:write_string_length)
 
     # @param [String] str string to write
     # @param [Numeric] len length of string to return
     # @return [self]
-    # Write +str+ in pointer's contents.
-    # If +len+ is given, write the first +len+ bytes of +str+.
-    # In both cases a final \0 byte is written after the string.
+    # Write +str+ in pointer's contents, or first +len+ bytes if
+    # +len+ is not +nil+.
     def write_string(str, len=nil)
-      if len
-        if len == size
-          warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
-          write_bytes(str, 0, len)
-        else
-          put_char(len, 0) # Check size before writing str
-          write_bytes(str, 0, len)
-        end
-      else
-        if str.bytesize == size
-          warn "[DEPRECATION] Memory too small to write a final 0-byte in #{caller(1, 1)[0]}. This will raise an error in ffi-2.0. Please use write_bytes instead or enlarge the memory region."
-          write_bytes(str)
-        else
-          put_string(0, str)
-        end
-      end
+      len = str.bytesize unless len
+      # Write the string data without NUL termination
+      put_bytes(0, str, 0, len)
     end unless method_defined?(:write_string)
 
     # @param [Type] type type of data to read from pointer's contents

data/lib/ffi/tools/const_generator.rb

@@ -124,7 +124,8 @@ module FFI
         f.puts "\n\treturn 0;\n}"
         f.flush
 
-        output = `gcc #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
+        cc = ENV['CC'] || 'gcc'
+        output = `#{cc} #{options[:cppflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
 
         unless $?.success? then
           output = output.split("\n").map { |l| "\t#{l}" }.join "\n"

data/lib/ffi/tools/struct_generator.rb

@@ -82,7 +82,8 @@ module FFI
         f.puts "\n  return 0;\n}"
         f.flush
 
-        output = `gcc #{options[:cppflags]} #{options[:cflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
+        cc = ENV['CC'] || 'gcc'
+        output = `#{cc} #{options[:cppflags]} #{options[:cflags]} -D_DARWIN_USE_64_BIT_INODE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -x c -Wall -Werror #{f.path} -o #{binary} 2>&1`
 
         unless $?.success? then
           @found = false

data/lib/ffi/variadic.rb

@@ -31,16 +31,7 @@
 #
 
 module FFI
-  class VariadicInvoker    
-    def init(arg_types, type_map)
-      @fixed = Array.new
-      @type_map = type_map
-      arg_types.each_with_index do |type, i|
-        @fixed << type unless type == Type::VARARGS
-      end
-    end
-
-
+  class VariadicInvoker
     def call(*args, &block)
       param_types = Array.new(@fixed)
       param_values = Array.new

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.14.0'
+  VERSION = '1.15.2'
 end

data/rakelib/ffi_gem_helper.rb

@@ -0,0 +1,65 @@
+require 'bundler'
+require 'bundler/gem_helper'
+
+class FfiGemHelper < Bundler::GemHelper
+  attr_accessor :cross_platforms
+
+  def install
+    super
+
+    task "release:guard_clean" => ["release:update_history"]
+
+    task "release:update_history" do
+      update_history
+    end
+
+    task "release:rubygem_push" => ["gem:windows", "gem:java"]
+  end
+
+  def hfile
+    "CHANGELOG.md"
+  end
+
+  def headline
+    '([^\w]*)(\d+\.\d+\.\d+(?:\.\w+)?)([^\w]+)([2Y][0Y][0-9Y][0-9Y]-[0-1M][0-9M]-[0-3D][0-9D])([^\w]*|$)'
+  end
+
+  def reldate
+    Time.now.strftime("%Y-%m-%d")
+  end
+
+  def update_history
+    hin = File.read(hfile)
+    hout = hin.sub(/#{headline}/) do
+      raise "#{hfile} isn't up-to-date for version #{version}" unless $2==version.to_s
+      $1 + $2 + $3 + reldate + $5
+    end
+    if hout != hin
+      Bundler.ui.confirm "Updating #{hfile} for release."
+      File.write(hfile, hout)
+      Rake::FileUtilsExt.sh "git", "commit", hfile, "-m", "Update release date in #{hfile}"
+    end
+  end
+
+  def tag_version
+    Bundler.ui.confirm "Tag release with annotation:"
+    m = File.read(hfile).match(/(?<annotation>#{headline}.*?)#{headline}/m) || raise("Unable to find release notes in #{hfile}")
+    Bundler.ui.info(m[:annotation].gsub(/^/, "    "))
+    IO.popen(["git", "tag", "--file=-", version_tag], "w") do |fd|
+      fd.write m[:annotation]
+    end
+    yield if block_given?
+  rescue
+    Bundler.ui.error "Untagging #{version_tag} due to error."
+    sh_with_code "git tag -d #{version_tag}"
+    raise
+  end
+
+  def rubygem_push(path)
+    cross_platforms.each do |ruby_platform|
+      super(path.gsub(/\.gem\z/, "-#{ruby_platform}.gem"))
+    end
+    super(path.gsub(/\.gem\z/, "-java.gem"))
+    super(path)
+  end
+end

metadata

@@ -1,14 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.2
 platform: java
 authors:
 - Wayne Meissner
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2020-12-18 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBCTANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
+  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
+  Fw0yMTA0MDcxMzQzNTZaFw0yMjA0MDcxMzQzNTZaMD0xDjAMBgNVBAMMBWthbmlz
+  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
+  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
+  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
+  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
+  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
+  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
+  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
+  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBAGCQhS4TBqUG1bSY5gw5
+  emj2GNePHFNlXTZ/W0/7FlnXQz/LyBZeYmy4AIHcdY0w9xsu3bPNGk8kLBkHgK3Y
+  l/yWiUK0NYRI3K3yI2EoTfrHPDT8XIgBPeUUGv5Nje+SUYMQWsfYWKo3+vLEG64a
+  n1xP+1+g2Za39WCS5LwnDWMiIk47NnxR9yXErKd0Iau/Q/IarYsHFX6kWWmlMoln
+  W1lMomCcOJFwIPnsy6aqq7YfS0YcqyHjcvs1h5k3zPaIRWhoPlQivniMVMa3Txh+
+  NEF/4atY64rruzkyfxGEcrFFOHJIkWnWQjRGaiZdgULxf7ira2gEFvV/ZtamqJWF
+  c+I=
+  -----END CERTIFICATE-----
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -140,6 +161,8 @@ files:
 - lib/ffi/platform/powerpc-linux/types.conf
 - lib/ffi/platform/powerpc-openbsd/types.conf
 - lib/ffi/platform/powerpc64-linux/types.conf
+- lib/ffi/platform/powerpc64le-linux/types.conf
+- lib/ffi/platform/riscv64-linux/types.conf
 - lib/ffi/platform/s390-linux/types.conf
 - lib/ffi/platform/s390x-linux/types.conf
 - lib/ffi/platform/sparc-linux/types.conf
@@ -173,6 +196,7 @@ files:
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
 - lib/ffi/version.rb
+- rakelib/ffi_gem_helper.rb
 - samples/getlogin.rb
 - samples/getpid.rb
 - samples/gettimeofday.rb
@@ -207,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Ruby FFI

metadata.gz.sig

@@ -0,0 +1 @@
+Vq�§��R;���BM�.US��L��q���B��w�]�"ύ�
1�����d?b>�\�+��MGCE��r�aE�5C�ߋ5�Rﱔ�+<��'��[�*��g��n���|k�=&��ZЭ#ģk�asG7��>W(G�!��Zխ�r|d7&[QG2nB�C�,_��E��7̹}�1Ү%��0UD�
��|\����-����KZ���cWfS���c�U��4�XaԠ�i����c��G����J!zPU��������U���