ruby-oci8 2.2.7 → 2.2.11

data/ext/oci8/oraconf.rb

@@ -4,7 +4,7 @@ require 'mkmf'
 # compatibility for ruby-1.9
 RbConfig = Config unless defined? RbConfig
 
-if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/
+if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/
   # Windows
   require 'win32/registry'
   module Registry
@@ -43,6 +43,10 @@ class MiniSOReader
   attr_reader :endian
   attr_reader :bits
 
+  MACH_O_CPU_TYPE_I386 = 7
+  MACH_O_CPU_TYPE_X86_64 = 7 + 0x01000000
+  MACH_O_CPU_TYPE_ARM64 = 12 + 0x01000000
+
   def initialize(filename)
     f = open(filename, 'rb')
     begin
@@ -56,9 +60,6 @@ class MiniSOReader
       when "\x02\x10"
         # HP-UX PA-RISC1.1
         read_parisc(f)
-      when "\xfe\xed"
-        # Big-endian Mach-O File
-        read_mach_o_be(f)
       when "\xce\xfa"
         # 32-bit Little-endian Mach-O File
         read_mach_o_le(f, 32)
@@ -67,10 +68,10 @@ class MiniSOReader
         read_mach_o_le(f, 64)
       when "\xca\xfe"
         # Universal binary
-        read_mach_o_unversal(f)
+        read_mach_o_universal(f)
       else
         # AIX and Tru64
-        raise format("unknown file header: %02x %02x", file_header[0].to_i, file_header[1].to_i)
+        raise format("unknown file header: %02x %02x (%s)", file_header[0].ord, file_header[1].ord, filename)
       end
     ensure
       f.close
@@ -174,22 +175,6 @@ class MiniSOReader
     @cpu = :parisc
   end
 
-  # Big-endian Mach-O File
-  def read_mach_o_be(f)
-    @file_format = :mach_o
-    @endian = :big
-    case f.read(2)
-    when "\xfa\xce" # feedface
-      @cpu = :ppc
-      @bits = 32
-    when "\xfa\xcf" # feedfacf
-      @cpu = :ppc64
-      @bits = 64
-    else
-      raise "unknown file format"
-    end
-  end
-
   def read_mach_o_le(f, bits)
     @file_format = :mach_o
     @endian = :little
@@ -199,12 +184,20 @@ class MiniSOReader
       @cpu = :i386
       @bits = 32
     when 64
-      @cpu = :x86_64
+      cputype = f.read(4).unpack('V')[0]
+      case cputype
+      when MACH_O_CPU_TYPE_X86_64
+        @cpu = :x86_64
+      when MACH_O_CPU_TYPE_ARM64
+        @cpu = :arm64
+      else
+        raise "unknown mach-o cpu type: #{cputype}"
+      end
       @bits = 64
     end
   end
 
-  def read_mach_o_unversal(f)
+  def read_mach_o_universal(f)
     raise 'unknown file format' if f.read(2) != "\xba\xbe" # cafebabe
     @file_format = :universal
     nfat_arch = f.read(4).unpack('N')[0]
@@ -213,21 +206,17 @@ class MiniSOReader
     @bits = []
     nfat_arch.times do
       case cputype = f.read(4).unpack('N')[0]
-      when 7
+      when MACH_O_CPU_TYPE_I386
         @cpu    << :i386
         @endian << :little
         @bits   << 32
-      when 7 + 0x01000000
+      when MACH_O_CPU_TYPE_X86_64
         @cpu    << :x86_64
         @endian << :little
         @bits   << 64
-      when 18
-        @cpu    << :ppc
-        @endian << :big
-        @bits   << 32
-      when 18 + 0x01000000
-        @cpu    << :ppc64
-        @endian << :big
+      when MACH_O_CPU_TYPE_ARM64
+        @cpu    << :arm64
+        @endian << :little
         @bits   << 64
       else
         raise "Unknown mach-o cputype: #{cputype}"
@@ -250,7 +239,6 @@ class OraConf
   def self.get
     original_CFLAGS = $CFLAGS
     original_defs = $defs
-    ic_dir = nil
     begin
       # check Oracle instant client
       if with_config('instant-client')
@@ -262,11 +250,17 @@ class OraConf
 =======================================================
 EOS
       end
-      ic_dir = check_ic_dir
-      if ic_dir
-        OraConfIC.new(ic_dir)
+      inc, lib = dir_config('instant-client')
+      if inc && lib
+        OraConfIC.new(inc, lib)
       else
-        OraConfFC.new()
+	base = guess_ic_dir
+	if base
+          inc, lib = guess_dirs_from_ic_base(base)
+          OraConfIC.new(inc, lib)
+	else
+	  OraConfFC.new
+	end
       end
     rescue
       case ENV['LANG']
@@ -298,6 +292,44 @@ EOS
     end
   end
 
+  # Guess the include and directory paths from 
+  def self.guess_dirs_from_ic_base(ic_dir)
+    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+(?:\.\d+)*)\/client(64)?\/lib(?:64)?/
+      # rpm package
+      #   x86 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client/lib/
+      #    include: /usr/include/oracle/X.X/client/
+      #
+      #   x86_64 rpms after 11.1.0.7.0:
+      #    library: /usr/lib/oracle/X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X/client64/
+      #
+      #   x86 rpms before 11.1.0.6.0:
+      #    library: /usr/lib/oracle/X.X.X.X/client/lib/
+      #    include: /usr/include/oracle/X.X.X.X/client/
+      #
+      #   x86_64 rpms before 11.1.0.6.0:
+      #    library: /usr/lib/oracle/X.X.X.X/client64/lib/
+      #    include: /usr/include/oracle/X.X.X.X/client64/
+      #
+      #   third-party x86_64 rpms(*1):
+      #    library: /usr/lib64/oracle/X.X.X.X/client/lib/
+      #          or /usr/lib64/oracle/X.X.X.X/client/lib64/
+      #    include: /usr/include/oracle/X.X.X.X/client/
+      #
+      #   *1 These had been used before Oracle released official x86_64 rpms.
+      #
+      lib_dir = ic_dir
+      inc_dir = "/usr/include/oracle/#{$1}/client#{$2}"
+    else
+      # zip package
+      lib_dir = ic_dir
+      inc_dir = "#{ic_dir}/sdk/include"
+    end
+
+    [inc_dir, lib_dir]
+  end
+
   def self.ld_envs
     @@ld_envs
   end
@@ -316,8 +348,9 @@ EOS
     end
   end
 
-  def self.check_ic_dir
-    puts "checking for load library path... "
+  def self.guess_ic_dir
+    puts "attempting to locate oracle-instantclient..."
+    puts "checking load library path... "
     STDOUT.flush
 
     # get library load path names
@@ -339,7 +372,7 @@ EOS
     is_32bit = size_of_pointer == 4
     is_big_endian = "\x01\x02".unpack('s')[0] == 0x0102
     case RUBY_PLATFORM
-    when /mswin32|mswin64|cygwin|mingw32|bccwin32/
+    when /mswin32|mswin64|cygwin|mingw/
       oci_basename = 'oci'
       oci_glob_postfix = ''
       nls_data_basename = ['oraociei*', 'oraociicus*']
@@ -382,20 +415,13 @@ EOS
       end
       so_ext = 'sl'
     when /darwin/
-      @@ld_envs = %w[DYLD_LIBRARY_PATH]
+      @@ld_envs = %w[OCI_DIR]
       so_ext = 'dylib'
       if is_32bit
-        if is_big_endian
-          this_cpu = :ppc    # 32-bit big-endian
-        else
-          this_cpu = :i386   # 32-bit little-endian
-        end
+        this_cpu = :i386   # 32-bit little-endian
       else
-        if is_big_endian
-          this_cpu = :ppc64  # 64-bit big-endian
-        else
-          this_cpu = :x86_64 # 64-bit little-endian
-        end
+        require 'etc'
+        this_cpu = Etc.uname[:machine].to_sym
       end
       check_proc = Proc.new do |file|
         so = MiniSOReader.new(file)
@@ -469,49 +495,6 @@ EOS
           end
         end
       when /darwin/
-        fallback_path = ENV['DYLD_FALLBACK_LIBRARY_PATH']
-        if fallback_path.nil?
-          puts "  DYLD_FALLBACK_LIBRARY_PATH is not set."
-        else
-          puts "  checking DYLD_FALLBACK_LIBRARY_PATH..."
-          ld_path, file = check_lib_in_path(fallback_path, glob_name, check_proc)
-        end
-        if ld_path.nil?
-          puts "  checking OCI_DIR..."
-          ld_path, file = check_lib_in_path(ENV['OCI_DIR'], glob_name, check_proc)
-          if ld_path
-            puts "  checking dependent shared libraries in #{file}..."
-            open("|otool -L #{file}") do |f|
-              f.gets # discard the first line
-              while line = f.gets
-                line =~ /^\s+(\S+)/
-                libname = $1
-                case libname
-                when /^@rpath\/libclntsh\.dylib/, /^@rpath\/libnnz\d\d\.dylib/, /^@loader_path\/libnnz\d\d\.dylib/
-                  # No need to check the real path.
-                  # The current instant client doesn't use @rpath or @loader_path.
-                when /\/libclntsh\.dylib/, /\/libnnz\d\d.dylib/
-                  raise <<EOS unless File.exists?(libname)
-The output of "otool -L #{file}" is:
-  | #{IO.readlines("|otool -L #{file}").join('  | ')}
-Ruby-oci8 doesn't work without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH
-because the dependent file "#{libname}" doesn't exist.
-
-If you need to use ruby-oci8 without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH,
-download "fix_oralib.rb" in https://github.com/kubo/fix_oralib_osx
-and execute it in the directory "#{File.dirname(file)}" as follows to fix the path.
-
-  cd #{File.dirname(file)}
-  curl -O https://raw.githubusercontent.com/kubo/fix_oralib_osx/master/fix_oralib.rb
-  ruby fix_oralib.rb
-
-Note: DYLD_* environment variables are unavailable for security reasons on OS X 10.11 El Capitan.
-EOS
-                end
-              end
-            end
-          end
-        end
         if ld_path.nil?
           fallback_path = ENV['DYLD_FALLBACK_LIBRARY_PATH']
           if fallback_path.nil?
@@ -522,17 +505,8 @@ EOS
         end
         if ld_path.nil?
           raise <<EOS
-Set the environment variable DYLD_LIBRARY_PATH, DYLD_FALLBACK_LIBRARY_PATH or
-OCI_DIR to point to the Instant client directory.
-
-If DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH is set, the environment
-variable must be set at runtime also.
-
-If OCI_DIR is set, dependent shared library paths are checked. If the checking
-is passed, ruby-oci8 works without DYLD_LIBRARY_PATH or DYLD_FALLBACK_LIBRARY_PATH.
-
-Note: OCI_DIR should be absolute path.
-Note: DYLD_* environment variables are unavailable for security reasons on OS X 10.11 El Capitan.
+Oracle instant client is not found.
+You need to install Oracle instant client.
 EOS
         end
       end
@@ -556,8 +530,8 @@ EOS
     paths.split(File::PATH_SEPARATOR).each do |path|
       next if path.nil? or path == ''
       print "    checking #{path}... "
-      path.gsub!(/\\/, '/') if /mswin32|mswin64|cygwin|mingw32|bccwin32/ =~ RUBY_PLATFORM
-      files = Dir.glob(File.join(path, glob_name))
+      path.gsub!(/\\/, '/') if /mswin32|mswin64|cygwin|mingw/ =~ RUBY_PLATFORM
+      files = Dir.glob(File.join(path, glob_name)).sort.reverse
       if files.empty?
         puts "no"
         next
@@ -631,20 +605,10 @@ EOS
     rubyhdrdir = RbConfig::CONFIG["rubyhdrdir"] || RbConfig::CONFIG['archdir']
     unless File.exist?(rubyhdrdir + '/ruby.h')
       puts "failed"
-      if RUBY_PLATFORM =~ /darwin/ and File.exist?("#{RbConfig::CONFIG['archdir']}/../universal-darwin8.0/ruby.h")
-        raise <<EOS
-#{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.
-Run the following commands to fix the problem.
-
-  cd #{RbConfig::CONFIG['archdir']}
-  sudo ln -s ../universal-darwin8.0/* ./
-EOS
-      else
-        raise <<EOS
+      raise <<EOS
 #{RbConfig::CONFIG['archdir']}/ruby.h doesn't exist.
 Install the ruby development library.
 EOS
-      end
     end
     puts "ok"
     $stdout.flush
@@ -660,11 +624,11 @@ EOS
     end
   end
 
-  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/ # when Windows
+  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/ # when Windows
 
     def get_libs(lib_dir)
       case RUBY_PLATFORM
-      when /cygwin|x64-mingw32/
+      when /cygwin/
         regex = ([nil].pack('P').size == 8) ? / T (OCI\w+)/ : / T _(OCI\w+)/
         oci_funcs = YAML.load(open(File.dirname(__FILE__) + '/apiwrap.yml')).keys.collect do |func|
           func =~ /_nb$/ ? $` : func
@@ -683,22 +647,6 @@ EOS
         system(command)
         puts("done")
         "-L. -lOCI"
-      when /bccwin32/
-        # replace '/' to '\\' because bcc linker misunderstands
-        # 'C:/foo/bar/OCI.LIB' as unknown option.
-        lib = "#{lib_dir}/BORLAND/OCI.LIB"
-        return lib.tr('/', '\\') if File.exist?(lib)
-        raise <<EOS
-#{lib} does not exist.
-
-Your Oracle may not support Borland C++.
-If you want to run this module, run the following command at your own risk.
-  cd #{lib_dir.tr('/', '\\')}
-  mkdir Borland
-  cd Borland
-  coff2omf ..\\MSVC\\OCI.LIB OCI.LIB
-EOS
-        exit 1
       else
         "\"#{lib_dir}/MSVC/OCI.LIB\""
       end
@@ -742,7 +690,7 @@ class OraConfFC < OraConf
       use_lib32 = false
     end
 
-    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/
+    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/
       lib_dir = "#{@oracle_home}/oci/lib"
     elsif use_lib32
       lib_dir = "#{@oracle_home}/lib32"
@@ -761,7 +709,7 @@ class OraConfFC < OraConf
     print("Get the version of Oracle from SQL*Plus... ")
     STDOUT.flush
     version = nil
-    dev_null = RUBY_PLATFORM =~ /mswin32|mswin64|mingw32|bccwin32/ ? "nul" : "/dev/null"
+    dev_null = RUBY_PLATFORM =~ /mswin32|mswin64|mingw/ ? "nul" : "/dev/null"
     if File.exist?("#{@oracle_home}/bin/plus80.exe")
       sqlplus = "plus80.exe"
     else
@@ -786,7 +734,7 @@ class OraConfFC < OraConf
     version
   end # get_version
 
-  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/ # when Windows
+  if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/ # when Windows
 
     def is_valid_home?(oracle_home)
       return false if oracle_home.nil?
@@ -868,7 +816,7 @@ EOS
       unless File.exist?("#{@oracle_home}/OCI/INCLUDE/OCI.H")
         raise "'#{@oracle_home}/OCI/INCLUDE/OCI.H' does not exists. Please install 'Oracle Call Interface'."
       end
-      if RUBY_PLATFORM =~ /cygwin|mingw32/
+      if RUBY_PLATFORM =~ /cygwin|mingw/
         " \"-I#{@oracle_home}/OCI/INCLUDE\" -D_int64=\"long long\""
       else
         " \"-I#{@oracle_home}/OCI/INCLUDE\""
@@ -947,56 +895,25 @@ end
 
 # OraConf for Instant Client
 class OraConfIC < OraConf
-  def initialize(ic_dir)
+  def initialize(inc_dir, lib_dir)
     init
 
-    if ic_dir =~ /^\/usr\/lib(?:64)?\/oracle\/(\d+(?:\.\d+)*)\/client(64)?\/lib(?:64)?/
-      # rpm package
-      #   x86 rpms after 11.1.0.7.0:
-      #    library: /usr/lib/oracle/X.X/client/lib/
-      #    include: /usr/include/oracle/X.X/client/
-      #
-      #   x86_64 rpms after 11.1.0.7.0:
-      #    library: /usr/lib/oracle/X.X/client64/lib/
-      #    include: /usr/include/oracle/X.X/client64/
-      #
-      #   x86 rpms before 11.1.0.6.0:
-      #    library: /usr/lib/oracle/X.X.X.X/client/lib/
-      #    include: /usr/include/oracle/X.X.X.X/client/
-      #
-      #   x86_64 rpms before 11.1.0.6.0:
-      #    library: /usr/lib/oracle/X.X.X.X/client64/lib/
-      #    include: /usr/include/oracle/X.X.X.X/client64/
-      #
-      #   third-party x86_64 rpms(*1):
-      #    library: /usr/lib64/oracle/X.X.X.X/client/lib/
-      #          or /usr/lib64/oracle/X.X.X.X/client/lib64/
-      #    include: /usr/include/oracle/X.X.X.X/client/
-      #
-      #   *1 These had been used before Oracle released official x86_64 rpms.
-      #
-      lib_dir = ic_dir
-      inc_dir = "/usr/include/oracle/#{$1}/client#{$2}"
-    else
-      # zip package
-      lib_dir = ic_dir
-      inc_dir = "#{ic_dir}/sdk/include"
-    end
-
-    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw32|bccwin32/ # when Windows
-      unless File.exist?("#{ic_dir}/sdk/lib/msvc/oci.lib")
+    # check lib_dir
+    lib_dirs = lib_dir.split(File::PATH_SEPARATOR)
+    if RUBY_PLATFORM =~ /mswin32|mswin64|cygwin|mingw/ # when Windows
+      ocilib = lib_dirs.find do |dir|
+        File.exist?("#{dir}/sdk/lib/msvc/oci.lib")
+      end
+      unless ocilib
         raise <<EOS
 Could not compile with Oracle instant client.
-#{ic_dir}/sdk/lib/msvc/oci.lib could not be found.
+"sdk/lib/msvc/oci.lib" could not be found in: #{lib_dirs.join(' ')}
+Did you install instantclient-basic?
 EOS
-        raise 'failed'
       end
-      @cflags = " \"-I#{inc_dir}\""
-      @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin|mingw32/
-      @libs = get_libs("#{ic_dir}/sdk/lib")
+      @libs = get_libs("#{ocilib}/sdk/lib")
       ld_path = nil
     else
-      @cflags = " -I#{inc_dir}"
       # set ld_path and so_ext
       case RUBY_PLATFORM
       when /aix/
@@ -1017,34 +934,53 @@ EOS
         so_ext = 'so'
       end
       # check Oracle client library.
-      unless File.exist?("#{lib_dir}/libclntsh.#{so_ext}")
-        files = Dir.glob("#{lib_dir}/libclntsh.#{so_ext}.*")
+      ocilib = lib_dirs.find do |dir|
+        File.exist?("#{dir}/libclntsh.#{so_ext}")
+      end
+      unless ocilib
+        files = lib_dirs.map do |dir|
+          Dir.glob("#{dir}/libclntsh.#{so_ext}.*")
+        end.flatten
         if files.empty?
           raise <<EOS
 Could not compile with Oracle instant client.
-'#{lib_dir}/libclntsh.#{so_ext}' could not be found.
+"libclntsh.#{so_ext}" could not be found in: #{lib_dirs.join(' ')}
 Did you install instantclient-basic?
 EOS
         else
-          file = File.basename(files.sort[-1])
+          file = files.sort[-1]
           raise <<EOS
 Could not compile with Oracle instant client.
-#{lib_dir}/libclntsh.#{so_ext} could not be found.
+"libclntsh.#{so_ext}" could not be found in: #{lib_dirs.join(' ')}
 You may need to make a symbolic link.
-   cd #{lib_dir}
-   ln -s #{file} libclntsh.#{so_ext}
+   cd #{File.dirname(file)}
+   ln -s #{File.basename(file)} libclntsh.#{so_ext}
 EOS
         end
         raise 'failed'
       end
       @libs = get_libs(lib_dir)
     end
-    unless File.exist?("#{inc_dir}/oci.h")
+
+    # check inc_dir
+    inc_dirs = inc_dir.split(File::PATH_SEPARATOR)
+    ociinc = inc_dirs.find do |dir|
+      File.exist?("#{dir}/oci.h")
+    end
+    unless ociinc
           raise <<EOS
-'#{inc_dir}/oci.h' does not exist.
+"oci.h" could not be found in: #{inc_dirs.join(' ')}
 Install 'Instant Client SDK'.
 EOS
     end
+    if ociinc.include?(' ')
+      @cflags = " \"-I#{ociinc}\""
+    else
+      @cflags = " -I#{ociinc}"
+    end
+    @cflags += " -D_int64=\"long long\"" if RUBY_PLATFORM =~ /cygwin|mingw/
+
+    # check link
     $CFLAGS += @cflags
     if try_link_oci()
       major = try_constant("OCI_MAJOR_VERSION", "oci.h")
@@ -1054,73 +990,10 @@ EOS
       else
         # 10.1.0 doesn't have OCI_MAJOR_VERSION and OCI_MINOR_VERSION in oci.h.
         @version = "1010"
-        if RUBY_PLATFORM =~ /darwin/ and 1.size == 8 and `sw_vers -productVersion`.chomp == "10.7"
-          $stderr.print <<EOS
-WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN!
-
-64-bit Oracle instant client doesn't work on OS X Lion.
-See: https://forums.oracle.com/forums/thread.jspa?threadID=2187558
-
-The compilation is continued because the issue may be fixed in future.
-
-WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN! WARN!
-EOS
-        end
       end
       return
     end
 
-    if RUBY_PLATFORM =~ /darwin/
-      open('mkmf.log', 'r') do |f|
-        while line = f.gets
-          if line.include? '/libclntsh.dylib load command 8 unknown cmd field'
-            raise <<EOS
-Intel mac instant client is for Mac OS X 10.5.
-It doesn't work on Mac OS X 10.4 or before.
-
-You have three workarounds.
-  1. Compile ruby as ppc binary and use it with ppc instant client.
-  2. Use JRuby and JDBC
-  3. Use a third-party ODBC driver and ruby-odbc.
-EOS
-            # '
-          end
-
-          case line
-          when /cputype \(\d+, architecture \w+\) does not match cputype \(\d+\) for specified -arch flag: (\w+)/
-            missing_arch = $1
-          when /Undefined symbols for architecture (\w+)/
-            missing_arch = $1
-          when /missing required architecture (\w+) in file/
-            missing_arch = $1
-          end
-
-          if missing_arch
-            if [nil].pack('p').size == 8
-              my_arch = 'x86_64'
-            elsif "\x01\x02".unpack('s')[0] == 0x0201
-              my_arch = 'i386'
-            else
-              my_arch = 'ppc'
-            end
-            raise <<EOS
-Could not compile with Oracle instant client.
-You may need to set the environment variable RC_ARCHS or ARCHFLAGS as follows:
-
-    RC_ARCHS=#{my_arch}
-    export RC_ARCHS
-or
-    ARCHFLAGS='-arch #{my_arch}'
-    export RC_ARCHS
-
-If it does not fix the problem, delete all '-arch #{missing_arch}'
-in '#{RbConfig::CONFIG['archdir']}/rbconfig.rb'.
-EOS
-          end
-        end
-      end
-    end
-
     unless ld_path.nil?
       raise <<EOS
 Could not compile with Oracle instant client.

data/ext/oci8/oradate.c

@@ -198,7 +198,7 @@ static VALUE ora_date_initialize_copy(VALUE lhs, VALUE rhs)
  *
  *  @return [OraDate]
  */
-static VALUE ora_date_s_now(int argc, VALUE *argv, VALUE klass)
+static VALUE ora_date_s_now(VALUE klass)
 {
     VALUE obj = ora_date_s_allocate(klass);
     ora_date_t *od = check_oradate(obj);

data/ext/oci8/plthook_osx.c

@@ -73,10 +73,10 @@ struct plthook {
 };
 
 static int plthook_open_real(plthook_t **plthook_out, const struct mach_header *mh);
-static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, int addrdiff);
+static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, ptrdiff_t addrdiff);
 
 static void set_errmsg(const char *fmt, ...) __attribute__((__format__ (__printf__, 1, 2)));
-static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, int seg_offset, struct segment_command_ **segments);
+static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, uint64_t seg_offset, struct segment_command_ **segments);
 
 static uint64_t uleb128(const uint8_t **p)
 {
@@ -148,7 +148,7 @@ int plthook_open_by_handle(plthook_t **plthook_out, void *hndl)
         RTLD_LAZY | RTLD_NOLOAD,
         RTLD_LAZY | RTLD_NOLOAD | RTLD_FIRST,
     };
-    int flag_idx;
+    size_t flag_idx;
 #define NUM_FLAGS (sizeof(flags) / sizeof(flags[0]))
 
     if (hndl == NULL) {
@@ -196,8 +196,8 @@ static int plthook_open_real(plthook_t **plthook_out, const struct mach_header *
     struct segment_command_ *segments[NUM_SEGMENTS];
     int segment_idx = 0;
     unsigned int nbind;
-    int addrdiff = 0;
-    int i;
+    ptrdiff_t addrdiff = 0;
+    uint32_t i;
 
     memset(segments, 0, sizeof(segments));
 #ifdef __LP64__
@@ -320,14 +320,14 @@ static int plthook_open_real(plthook_t **plthook_out, const struct mach_header *
     return 0;
 }
 
-static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, int addrdiff)
+static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint32_t lazy_bind_off, uint32_t lazy_bind_size, struct segment_command_ **segments, ptrdiff_t addrdiff)
 {
     const uint8_t *ptr = base + lazy_bind_off + addrdiff;
     const uint8_t *end = ptr + lazy_bind_size;
     const char *sym_name;
     int seg_index = 0;
     uint64_t seg_offset = 0;
-    int count, skip;
+    uint64_t count, skip;
     unsigned int idx;
     DEBUG_BIND("get_bind_addr(%p, 0x%x, 0x%x", base, lazy_bind_off, lazy_bind_size);
     for (idx = 0; segments[idx] != NULL; idx++) {
@@ -341,7 +341,7 @@ static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint3
         uint8_t imm = *ptr & BIND_IMMEDIATE_MASK;
         uint64_t ulebval;
         int64_t slebval;
-        int i;
+        uint64_t i;
 
         DEBUG_BIND("0x%02x: ", *ptr);
         ptr++;
@@ -410,10 +410,10 @@ static unsigned int get_bind_addr(plthook_t *plthook, const uint8_t *base, uint3
     return idx;
 }
 
-static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, int seg_offset, struct segment_command_ **segments)
+static void set_bind_addr(unsigned int *idx, plthook_t *plthook, const uint8_t *base, const char *sym_name, int seg_index, uint64_t seg_offset, struct segment_command_ **segments)
 {
     if (plthook != NULL) {
-        uint32_t vmaddr = segments[seg_index]->vmaddr;
+        uint64_t vmaddr = segments[seg_index]->vmaddr;
         plthook->entries[*idx].name = sym_name;
         plthook->entries[*idx].addr = (void**)(base + vmaddr + seg_offset);
     }