ffi 1.9.21-x64-mingw32 → 1.9.22-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1af8d6000634e4f90fddaee628dee2d0a1ade01f0b78c72b893f77196be92289
-  data.tar.gz: b8c969d63c80315a25b9e84a3ed9e06f318eccecdc1053c11fc34083fa7d7a1c
+  metadata.gz: 9f32e1c34c0799f59b392bccd82c1f1ef82fde90851dda8bd3e110c001053f06
+  data.tar.gz: b6c17ece44781c5d649afc0cb3814fe98d589d886220b0f8abb205124c38d77b
 SHA512:
-  metadata.gz: 6ea74d42506450448c8ef06a94a5a03ff012f4552a0c04311aaa25645d340d7e43aa286c1cab56ad4336fb9b401099f3445d630c4d0eb5f55707537573426db0
-  data.tar.gz: c6ee0e3e0c30eed01007f8d988494ff11fc912d15949144074feb19561939ce7efd20742c9445f2a5f9cfeeafb5956e3699049d26cbdf3e820feb5fdff9c7522
+  metadata.gz: 31ad76b116c9ba9e7a4ecd6277368a95129bfe27fa71a2082a601752b61c4c3331da25c7173c4177c2b4d9a675b79244de368135134e00d9479e1d25d6dd3233
+  data.tar.gz: 339e0136cad21b031775e09d04678a4ab063631d528eaabd26d13fca96d90d382862d526479909c3be79d12a36c28482ad093569a6da9cb41561cc0c7ecf1fdc

data/.gitignore

@@ -0,0 +1,22 @@
+doc/
+bin/
+.yardoc
+*.orig
+nbproject/private
+pkg
+*.orig
+*.rej
+*.patch
+*.diff
+build
+*.so
+*.[oa]
+core
+lib/ffi/types.conf
+lib/ffi_c.bundle
+lib/ffi_c.so
+vendor
+.bundle
+Gemfile.lock
+types_log
+*.gem

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ext/ffi_c/libffi"]
+	path = ext/ffi_c/libffi
+	url = https://github.com/libffi/libffi.git

data/.travis.yml

@@ -0,0 +1,52 @@
+dist: trusty
+sudo: false
+group: beta
+language: ruby
+before_install:
+  - gem install bundler
+script:
+  - bundle exec rake compile || bundle exec rake compile
+  - bundle exec rake test
+os:
+  - linux
+  - osx
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.3
+  - 2.5.0
+  - ruby-head
+  - rbx
+  - system
+env:
+  - CC=gcc
+  - CC=clang
+matrix:
+  allow_failures:
+    - rvm: system
+    - os: osx
+      rvm: 2.0.0
+    - os: osx
+      rvm: ruby-head
+    - rvm: rbx
+    - rvm: rbx-head
+    - rvm: 1.9.3
+  exclude: # ruby 2.4.2 needs build with xcode9 or later on osx
+    - os: osx
+      rvm: 2.4.2
+  include:
+    - os: osx
+      osx_image: xcode9.1
+      rvm: 2.4.2
+      env:
+      - CC=gcc
+    - os: osx
+      osx_image: xcode9.1
+      rvm: 2.4.2
+      env:
+      - CC=clang
+after_failure:
+  - "find build -name mkmf.log | xargs cat"

data/.yardopts

@@ -0,0 +1,5 @@
+--title "Ruby FFI"
+--charset UTF-8
+--private
+lib/**/*.rb
+ext/**/*.c

data/Gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'rake', '~> 10.1'
+  gem 'rake-compiler', '~> 1.0.3'
+  gem 'rake-compiler-dock', '~> 0.6.2'
+  gem 'rspec', '~> 3.0'
+  gem 'rubygems-tasks', '~> 0.2.4', :require => 'rubygems/tasks'
+  gem "rubysl", "~> 2.0", :platforms => 'rbx'
+end
+
+group :doc do
+  gem 'kramdown'
+  gem 'yard', '~> 0.9'
+end

data/{spec/ffi/LICENSE.SPECS → LICENSE.SPECS}

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Ruby-FFI contributors
+Copyright (c) 2008-2012 Ruby-FFI contributors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,4 +1,4 @@
-# ruby-ffi https://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi)
+# ruby-ffi https://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi) [![Build status Windows](https://ci.appveyor.com/api/projects/status/r8wxn1sd4s794gg1/branch/master?svg=true)](https://ci.appveyor.com/project/larskanis/ffi-aofqa/branch/master)
 
 ## Description
 

data/Rakefile

@@ -100,7 +100,7 @@ else
 end
 
 desc "Build all packages"
-task :package => 'gem:package'
+task :package => %w[ gem:java gem:windows ]
 
 CLOBBER.include 'lib/ffi/types.conf'
 CLOBBER.include 'pkg'
@@ -184,10 +184,11 @@ if USE_RAKE_COMPILER
     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_compiling do |spec|
+      spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
+    end
   end
 
-  ENV['RUBY_CC_VERSION'] ||= '1.9.3:2.0.0:2.1.6:2.2.2:2.3.0'
-
   # 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|
@@ -206,6 +207,30 @@ if USE_RAKE_COMPILER
   end
 end
 
+directory "ext/ffi_c/libffi"
+file "ext/ffi_c/libffi/autogen.sh" => "ext/ffi_c/libffi" do
+  warn "Downloading libffi ..."
+  sh "git submodule update --init --recursive"
+end
+
+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
+gem_spec.files.select do |f|
+  f =~ /ext\/ffi_c\/libffi\/(.*)/ && !LIBFFI_GIT_FILES.include?($1)
+end.each do |f|
+  file f => "ext/ffi_c/libffi/autogen.sh" do
+    chdir "ext/ffi_c/libffi" do
+      sh "sh ./autogen.sh"
+    end
+    touch f
+    if gem_spec.files != Gem::Specification.load('./ffi.gemspec').files
+      warn "gemspec files have changed -> Please restart rake!"
+      exit 1
+    end
+  end
+end
+
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 require 'ffi/platform'
 types_conf = File.expand_path(File.join(FFI::Platform::CONF_DIR, 'types.conf'))

data/appveyor.yml

@@ -0,0 +1,22 @@
+install:
+  - SET PATH=C:\Ruby%RUBYVER%\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - ps: |
+      if ($env:RUBYVER -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:RUBYVER.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:RUBYVER
+      }
+  - ridk version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundle install
+build: off
+build_script:
+  - bundle exec rake compile || bundle exec rake compile
+test_script:
+  - bundle exec rake test
+environment:
+  matrix:
+    - RUBYVER: "head-x64"
+    - RUBYVER: 24
+    - RUBYVER: 25-x64

data/ffi.gemspec

@@ -8,7 +8,20 @@ Gem::Specification.new do |s|
   s.homepage = 'http://wiki.github.com/ffi/ffi'
   s.summary = 'Ruby FFI'
   s.description = 'Ruby FFI library'
-  s.files = %w(ffi.gemspec LICENSE COPYING README.md Rakefile) + Dir.glob("{ext,gen,lib,spec,libtest}/**/*").reject { |f| f =~ /(lib\/[12]\.[089]|\.s?[ao]$|\.bundle|\.dylib$)/ }
+  s.files = `git ls-files -z`.split("\x0").reject do |f|
+    f =~ /^(bench|gen|libtest|nbproject|spec)/
+  end
+
+  # Add libffi git files
+  lfs = `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0")
+  # Add autoconf generated files of libffi
+  lfs += %w[ configure config.guess config.sub install-sh ltmain.sh missing fficonfig.h.in ]
+  # Add automake generated files of libffi
+  lfs += `git --git-dir ext/ffi_c/libffi/.git ls-files -z *.am */*.am`.gsub(".am\0", ".in\0").split("\x0")
+  s.files += lfs.map do |f|
+    File.join("ext/ffi_c/libffi", f)
+  end
+
   s.extensions << 'ext/ffi_c/extconf.rb'
   s.has_rdoc = false
   s.rdoc_options = %w[--exclude=ext/ffi_c/.*\.o$ --exclude=ffi_c\.(bundle|so)$]

data/lib/ffi/library.rb

@@ -344,7 +344,7 @@ module FFI
       raise FFI::NotFoundError.new(cname, ffi_libraries) if address.nil? || address.null?
       if type.is_a?(Class) && type < FFI::Struct
         # If it is a global struct, just attach directly to the pointer
-        s = type.new(address)
+        s = s = type.new(address) # Assigning twice to suppress unused variable warning
         self.module_eval <<-code, __FILE__, __LINE__
           @@ffi_gvar_#{mname} = s
           def self.#{mname}

data/lib/ffi/version.rb

@@ -1,4 +1,4 @@
 module FFI
-  VERSION = '1.9.21'
+  VERSION = '1.9.22'
 end
 

data/samples/getlogin.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'ffi'
+module Foo
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  attach_function :getlogin, [ ], :string
+end
+puts "getlogin=#{Foo.getlogin}"

data/samples/getpid.rb

@@ -0,0 +1,8 @@
+require 'rubygems'
+require 'ffi'
+module Foo
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  attach_function :getpid, [ ], :int
+end
+puts "My pid=#{Foo.getpid}"

data/samples/gettimeofday.rb

@@ -0,0 +1,18 @@
+require 'rubygems'
+require 'ffi'
+class Timeval < FFI::Struct
+  rb_maj, rb_min, rb_micro = RUBY_VERSION.split('.')
+  if rb_maj.to_i >= 1 && rb_min.to_i >= 9 || RUBY_PLATFORM =~ /java/
+    layout :tv_sec => :ulong, :tv_usec => :ulong
+  else
+    layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4
+  end
+end
+module LibC
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  attach_function :gettimeofday, [ :pointer, :pointer ], :int
+end
+t = Timeval.new
+LibC.gettimeofday(t.pointer, nil)
+puts "t.tv_sec=#{t[:tv_sec]} t.tv_usec=#{t[:tv_usec]}"

data/samples/hello.rb

@@ -0,0 +1,7 @@
+require File.expand_path(File.join(File.dirname(__FILE__), "sample_helper"))
+module Foo
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  attach_function("cputs", "puts", [ :string ], :int)
+end
+Foo.cputs("Hello, World via libc puts using FFI on MRI ruby")

data/samples/inotify.rb

@@ -0,0 +1,60 @@
+require 'rubygems'
+require 'ffi'
+module Inotify
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  class Event < FFI::Struct
+    layout \
+      :wd, :int,
+      :mask, :uint,
+      :cookie, :uint,
+      :len, :uint
+  end
+  attach_function :init, :inotify_init, [ ], :int
+  attach_function :add_watch, :inotify_add_watch, [ :int, :string, :uint ], :int
+  attach_function :rm_watch, :inotify_rm_watch, [ :int, :uint ], :int
+  attach_function :read, [ :int, :buffer_out, :uint ], :int
+  IN_ACCESS=0x00000001
+  IN_MODIFY=0x00000002
+  IN_ATTRIB=0x00000004
+  IN_CLOSE_WRITE=0x00000008
+  IN_CLOSE_NOWRITE=0x00000010
+  IN_CLOSE=(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE)
+  IN_OPEN=0x00000020
+  IN_MOVED_FROM=0x00000040
+  IN_MOVED_TO=0x00000080
+  IN_MOVE= (IN_MOVED_FROM | IN_MOVED_TO)
+  IN_CREATE=0x00000100
+  IN_DELETE=0x00000200
+  IN_DELETE_SELF=0x00000400
+  IN_MOVE_SELF=0x00000800
+  # Events sent by the kernel.
+  IN_UNMOUNT=0x00002000
+  IN_Q_OVERFLOW=0x00004000
+  IN_IGNORED=0x00008000
+  IN_ONLYDIR=0x01000000
+  IN_DONT_FOLLOW=0x02000000
+  IN_MASK_ADD=0x20000000
+  IN_ISDIR=0x40000000
+  IN_ONESHOT=0x80000000
+  IN_ALL_EVENTS=(IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE \
+                          | IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM \
+                          | IN_MOVED_TO | IN_CREATE | IN_DELETE \
+                          | IN_DELETE_SELF | IN_MOVE_SELF)
+
+end
+if $0 == __FILE__
+  fd = Inotify.init
+  puts "fd=#{fd}"
+  wd = Inotify.add_watch(fd, "/tmp/", Inotify::IN_ALL_EVENTS)
+  fp = FFI::IO.for_fd(fd)
+  puts "wfp=#{fp}"
+  while true
+    buf = FFI::Buffer.alloc_out(Inotify::Event.size + 4096, 1, false)
+    ev = Inotify::Event.new buf
+    ready = IO.select([ fp ], nil, nil, nil)
+    n = Inotify.read(fd, buf, buf.total)
+    puts "Read #{n} bytes from inotify fd"
+    puts "event.wd=#{ev[:wd]} mask=#{ev[:mask]} len=#{ev[:len]} name=#{ev[:len] > 0 ? buf.get_string(16) : 'unknown'}"
+  end
+end

data/samples/pty.rb

@@ -0,0 +1,76 @@
+require 'ffi'
+
+
+module PTY
+  private
+  module LibC
+    extend FFI::Library
+    ffi_lib FFI::Library::LIBC
+    attach_function :forkpty, [ :buffer_out, :buffer_out, :buffer_in, :buffer_in ], :int
+    attach_function :openpty, [ :buffer_out, :buffer_out, :buffer_out, :buffer_in, :buffer_in ], :int
+    attach_function :login_tty, [ :int ], :int
+    attach_function :close, [ :int ], :int
+    attach_function :strerror, [ :int ], :string
+    attach_function :fork, [], :int
+    attach_function :execv, [ :string, :buffer_in ], :int
+    attach_function :execvp, [ :string, :buffer_in ], :int
+    attach_function :dup2, [ :int, :int ], :int
+    attach_function :dup, [ :int ], :int
+  end
+  Buffer = FFI::Buffer
+  def self.build_args(args)
+    cmd = args.shift
+    cmd_args = args.map do |arg|
+      MemoryPointer.from_string(arg)
+    end
+    exec_args = MemoryPointer.new(:pointer, 1 + cmd_args.length + 1)
+    exec_cmd = MemoryPointer.from_string(cmd)
+    exec_args[0].put_pointer(0, exec_cmd)
+    cmd_args.each_with_index do |arg, i|
+      exec_args[i + 1].put_pointer(0, arg)
+    end
+    [ cmd, exec_args ]
+  end
+  public
+  def self.getpty(*args)
+    mfdp = Buffer.new :int
+    name = Buffer.new 1024
+    #
+    # All the execv setup is done in the parent, since doing anything other than
+    # execv in the child after fork is really flakey
+    #
+    exec_cmd, exec_args = build_args(args)
+    pid = LibC.forkpty(mfdp, name, nil, nil)
+    raise "forkpty failed: #{LibC.strerror(FFI.errno)}" if pid < 0    
+    if pid == 0
+      LibC.execvp(exec_cmd, exec_args)
+      exit 1
+    end
+    masterfd = mfdp.get_int(0)
+    rfp = FFI::IO.for_fd(masterfd, "r")
+    wfp = FFI::IO.for_fd(LibC.dup(masterfd), "w")
+    if block_given?
+      yield rfp, wfp, pid
+      rfp.close unless rfp.closed?
+      wfp.close unless wfp.closed?
+    else
+      [ rfp, wfp, pid ]
+    end
+  end
+  def self.spawn(*args, &block)
+    self.getpty("/bin/sh", "-c", args[0], &block)
+  end
+end
+module LibC
+  extend FFI::Library
+  attach_function :close, [ :int ], :int
+  attach_function :write, [ :int, :buffer_in, :ulong ], :long
+  attach_function :read, [ :int, :buffer_out, :ulong ], :long
+end
+PTY.getpty("/bin/ls", "-alR", "/") { |rfd, wfd, pid|
+#PTY.spawn("ls -laR /") { |rfd, wfd, pid|
+  puts "child pid=#{pid}"
+  while !rfd.eof? && (buf = rfd.gets)
+    puts "child: '#{buf.strip}'"
+  end
+}