ruby-magic 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be72439dd976c929316ed38bd3cb1bdfd31436120e4d62db55858eac2c6a7645
-  data.tar.gz: 976cd79869df839352f50f05fbd80117db27a52800812013266df50bde6fe342
+  metadata.gz: 1a066f36addb7d1c8cbe0858a67fa6a8e2103b3d365ab2d0ccda3027ea43a8ce
+  data.tar.gz: 3828bda59c9df6377991481d7f4fa9a8526e981804ff80dbb84aeba7eb316578
 SHA512:
-  metadata.gz: b8c1a58140d2a7d7fe473d6310ab478f798ce1088b524a653b0f3535af1a368a52da887d3fd8102b9ec47c96a3c62ab883bc493d949278cb450b91a3c6b249b7
-  data.tar.gz: 22715a80bc847c7cc4fc7ce58c098e36a0b32514f56ad39b0fadb4f8f7f62b2ac7ccd15101cd33b5b9ec8448494833a9199504b21b95d85b0cbfd92a0c1d8592
+  metadata.gz: 1ea5942f3c0f33f438f684437a3def3db633f18a279c84574f8a9ee0022d60e8852954b99ee32cc5ad7aa0fa5e10e1b1673e97575d72dfe28c862ac18476d551
+  data.tar.gz: 7ad49df412d72dd3d2b29e07509916e7aef46bf3058191019a290d07fed8792877fa623b9d327e4fa94fa21f49ef2fc8ad242777d3f398c53322a08413dd6a58

data/CONTRIBUTORS.md

@@ -0,0 +1,15 @@
+# Ruby Magic contributors
+
+We thank all of our [contributors][1]!
+
+The following is a list of people who have contributed at some point to the code
+of Ruby Magic. They are hereby acknowledged and collectively identified as "The
+Ruby Magic Authors". Copyright is held by the original contributor according to
+the versioning history; see [LICENSE](LICENSE) file.
+
+
+- John Hawthorn ([@jhawthorn](https://github.com/jhawthorn))
+- Shinya Maeda ([@dosuken123](https://github.com/dosuken123))
+- Stan Hu ([@stanhu](https://github.com/stanhu))
+
+[1]: https://github.com/kwilczynski/ruby-magic/graphs/contributors "Contributors"

data/NOTICE

@@ -464,3 +464,42 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+* file
+
+file(1) Command and the libmagic(3) library.
+
+LICENSE:
+  BSD, CDDL
+
+HOMEPAGE:
+  http://darwinsys.com/file
+
+Copyright (c) Ian F. Darwin 1986, 1987, 1989, 1990, 1991, 1992, 1994, 1995.
+Software written by Ian F. Darwin and others;
+maintained 1994- Christos Zoulas.
+
+This software is not subject to any export provision of the United States
+Department of Commerce, and may be exported to any country or planet.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice immediately at the beginning of the file, without modification,
+   this list of conditions, and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

data/README.md

@@ -1,6 +1,6 @@
 # File Magic in Ruby
 
-[![Build Status](https://travis-ci.org/kwilczynski/ruby-magic.svg)](https://travis-ci.org/kwilczynski/ruby-magic)
+[![Build Status](https://travis-ci.com/kwilczynski/ruby-magic.svg)](https://travis-ci.com/kwilczynski/ruby-magic)
 [![Documentation Status](https://inch-ci.org/github/kwilczynski/ruby-magic.svg)](https://inch-ci.org/github/kwilczynski/ruby-magic)
 [![Gem Version](https://badge.fury.io/rb/ruby-magic.svg)](http://badge.fury.io/rb/ruby-magic)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
@@ -14,13 +14,14 @@ Provides simple interface to [libmagic][1] for Ruby Programming Language.
 1. [Contributing](#contributing)
 2. [Versioning](#versioning)
 3. [Author](#author)
+4. [Contributors](#contributors)
 4. [Copyright](#copyright)
 5. [License](#license)
 
 ## Contributing
 
-See [CONTRIBUTING.md](CONTRIBUTING.md) for best practices and instructions on
-setting up your development environment.
+See the [CONTRIBUTING.md](CONTRIBUTING.md) for best practices and instructions
+on setting up your development environment.
 
 ## Versioning
 
@@ -31,6 +32,11 @@ For the versions available, see the tags on this repository.
 
 Krzysztof Wilczyński (<kw@linux.com>)
 
+## Contributors
+
+See the [CONTRIBUTORS.md](CONTRIBUTORS.md) file for a list of contributors to
+the project.
+
 ## Copyright
 
 Copyright 2013-2021 Krzysztof Wilczyński

data/ext/magic/common.h

@@ -26,8 +26,11 @@ extern "C" {
 #include <errno.h>
 #include <assert.h>
 #include <sys/stat.h>
+
 #include <magic.h>
+
 #include <ruby.h>
+#include <ruby/version.h>
 
 #if defined(HAVE_RUBY_IO_H)
 # include <ruby/io.h>
@@ -58,6 +61,12 @@ extern "C" {
 #define MAGIC_EXTENSION_SEPARATOR "/"
 #define MAGIC_CONTINUE_SEPARATOR "\n- "
 
+#if !defined(MAGIC_SYSTEM_LIBRARIES)
+# define MAGIC_STATUS_CHECK(x) x
+#else
+# define MAGIC_STATUS_CHECK(x) 1
+#endif
+
 #if !defined(MAGIC_NO_CHECK_CSV)
 # define MAGIC_NO_CHECK_CSV 0
 #endif
@@ -82,6 +91,12 @@ extern "C" {
 #define RARRAY_EMPTY_P(a) (RARRAY_LEN(a) == 0)
 #define RARRAY_FIRST(a)   (RARRAY_EMPTY_P(a) ? Qnil : rb_ary_entry((a), 0))
 
+#if RUBY_API_VERSION_CODE > 20700
+# define RVALUE_TYPE enum ruby_value_type
+#else
+# define RVALUE_TYPE int
+#endif
+
 #define CLASS_NAME(o) (NIL_P((o)) ? "nil" : rb_obj_classname((o)))
 
 #if !defined(T_INTEGER)

data/ext/magic/extconf.rb

@@ -1,42 +1,152 @@
 # frozen_string_literal: true
 
+require 'find'
 require 'mkmf'
-require 'digest'
-require 'open-uri'
-
-LIBMAGIC_TAG = '5.39'.freeze
-
-workdir = Dir.pwd
-libdir = File.join(workdir, 'file-' + LIBMAGIC_TAG)
-gemdir = File.expand_path(File.join(__dir__, '../..'))
-gem_ext_dir = File.join(gemdir, 'lib', 'ext')
-gem_include_dir = File.join(gem_ext_dir, 'include')
-gem_lib_dir = File.join(gem_ext_dir, 'lib')
-build_lib_dir = File.join(libdir, 'src', '.libs')
-
-expected_sha256 = 'f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1'
-filename = "#{workdir}/file.tar.gz"
-
-unless File.exist?(filename)
-  File.open(filename, 'wb') do |target_file|
-    URI.open("https://fossies.org/linux/misc/file-#{LIBMAGIC_TAG}.tar.gz", "User-Agent" => "RubyMagic/#{RUBY_DESCRIPTION}") do |read_file|
-      target_file.write(read_file.read)
+require 'pathname'
+
+LIBMAGIC_TAG = '5.39'
+LIBIMAGE_SHA256 = 'f05d286a76d9556243d0cb05814929c2ecf3a5ba07963f8f70bfaaa70517fad1'
+
+# helpful constants
+PACKAGE_ROOT_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+
+# The gem version constraint in the Rakefile is not respected at install time.
+# Keep this version in sync with the one in the Rakefile !
+REQUIRED_MINI_PORTILE_VERSION = "~> 2.5.0"
+
+MAGIC_HELP_MESSAGE = <<~HELP
+  USAGE: ruby #{$0} [options]
+
+    Flags that are always valid:
+
+      --use-system-libraries
+      --enable-system-libraries
+          Use system libraries instead of building and using the packaged libraries.
+
+      --disable-system-libraries
+          Use the packaged libraries, and ignore the system libraries. This is the default on most
+          platforms, and overrides `--use-system-libraries` and the environment variable
+          `MAGIC_USE_SYSTEM_LIBRARIES`.
+
+      --disable-clean
+          Do not clean out intermediate files after successful build.
+
+    Flags only used when building and using the packaged libraries:
+
+      --disable-static
+          Do not statically link packaged libraries, instead use shared libraries.
+
+      --enable-cross-build
+          Enable cross-build mode. (You probably do not want to set this manually.)
+
+    Flags only used when using system libraries:
+
+      Related to libmagic:
+
+        --with-magic-dir=DIRECTORY
+            Look for libmagic headers and library in DIRECTORY.
+
+        --with-magic-lib=DIRECTORY
+            Look for libmagic library in DIRECTORY.
+
+        --with-magic-include=DIRECTORY
+            Look for libmagic headers in DIRECTORY.
+
+    Environment variables used:
+
+      CC
+          Use this path to invoke the compiler instead of `RbConfig::CONFIG['CC']`
+
+      CPPFLAGS
+          If this string is accepted by the C preprocessor, add it to the flags passed to the C preprocessor
+
+      CFLAGS
+          If this string is accepted by the compiler, add it to the flags passed to the compiler
+
+      LDFLAGS
+          If this string is accepted by the linker, add it to the flags passed to the linker
+
+      LIBS
+          Add this string to the flags passed to the linker
+HELP
+
+def process_recipe(name, version, static_p, cross_p)
+  require 'rubygems'
+  gem('mini_portile2', REQUIRED_MINI_PORTILE_VERSION)
+  require 'mini_portile2'
+  message("Using mini_portile version #{MiniPortile::VERSION}\n")
+
+  MiniPortile.new(name, version).tap do |recipe|
+    # Prefer host_alias over host in order to use i586-mingw32msvc as
+    # correct compiler prefix for cross build, but use host if not set.
+    recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+    recipe.target = File.join(PACKAGE_ROOT_DIR, "ports")
+    recipe.configure_options << "--libdir=#{File.join(recipe.path, 'lib')}"
+
+    yield recipe
+
+    env = Hash.new do |hash, key|
+      hash[key] = (ENV[key]).to_s
+    end
+
+    recipe.configure_options.flatten!
+
+    recipe.configure_options = [
+      "--disable-silent-rules",
+      "--disable-dependency-tracking",
+      "--enable-fsect-man5"
+    ]
+
+    if static_p
+      recipe.configure_options += [
+        "--disable-shared",
+        "--enable-static",
+      ]
+      env["CFLAGS"] = concat_flags(env["CFLAGS"], "-fPIC")
+    else
+      recipe.configure_options += [
+        "--enable-shared",
+        "--disable-static",
+      ]
+    end
+
+    if cross_p
+      recipe.configure_options += [
+        "--target=#{recipe.host}",
+        "--host=#{recipe.host}",
+      ]
     end
-  end
 
-  checksum = Digest::SHA256.hexdigest(File.read(filename))
+    recipe.configure_options += env.map do |key, value|
+      "#{key}=#{value.strip}"
+    end
 
-  if checksum != expected_sha256
-    raise "SHA256 of #{filename} does not match: got #{checksum}, expected #{expected_sha256}"
+    recipe.cook
+    recipe.activate
   end
 end
 
-system("tar -xzf #{filename}") || raise('ERROR')
-system("cd #{libdir} && ./configure --prefix=#{gem_ext_dir} && make install") || raise('ERROR')
+#
+#  utility functions
+#
+def config_clean?
+  enable_config('clean', true)
+end
+
+def config_static?
+  default_static = !truffle?
+  enable_config("static", default_static)
+end
+
+def config_cross_build?
+  enable_config("cross-build")
+end
 
-$LOCAL_LIBS << '-lmagic'
-$LIBPATH << gem_lib_dir
-$CFLAGS << " -I #{libdir}/src"
+def config_system_libraries?
+  enable_config("system-libraries", ENV.key?("MAGIC_USE_SYSTEM_LIBRARIES")) do |_, default|
+    arg_config('--use-system-libraries', default)
+  end
+end
 
 def darwin?
   RbConfig::CONFIG['target_os'] =~ /darwin/
@@ -46,38 +156,129 @@ def windows?
   RbConfig::CONFIG['target_os'] =~ /mswin|mingw32|windows/
 end
 
+def truffle?
+  ::RUBY_ENGINE == 'truffleruby'
+end
+
+def concat_flags(*args)
+  args.compact.join(" ")
+end
+
+def do_help
+  print(MAGIC_HELP_MESSAGE)
+  exit!(0)
+end
+
+def do_clean
+  root = Pathname(PACKAGE_ROOT_DIR)
+  pwd  = Pathname(Dir.pwd)
+
+  # Skip if this is a development work tree
+  unless (root + '.git').exist?
+    message("Cleaning files only used during build.\n")
+
+    # (root + 'tmp') cannot be removed at this stage because
+    # libmagic.so is yet to be copied to lib.
+
+    # clean the ports build directory
+    Pathname.glob(pwd.join('tmp', '*', 'ports')) do |dir|
+      FileUtils.rm_rf(dir, verbose: true)
+    end
+
+    FileUtils.rm_rf(root + 'ports' + 'archives', verbose: true)
+
+    # Remove everything but share/ directory
+    remove_paths = %w[bin include]
+    remove_paths << 'lib' if config_static?
+
+    Pathname.glob(File.join(root, 'ports', '*', 'libmagic', '*')) do |dir|
+      remove_paths.each do |path|
+        remove_dir = File.join(dir, path)
+        FileUtils.rm_rf(remove_dir, verbose: true)
+      end
+    end
+  end
+
+  exit!(0)
+end
+
+#
+#  main
+#
+do_help if arg_config('--help')
+do_clean if arg_config('--clean')
+
 if ENV['CC']
   RbConfig::CONFIG['CC'] = RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC']
 end
 
 ENV['CC'] = RbConfig::CONFIG['CC']
 
-$CFLAGS += ' -std=c99 -fPIC'
-$CFLAGS += ' -Wall -Wextra -pedantic'
+append_cflags(ENV["CFLAGS"].split) if ENV["CFLAGS"]
+append_cppflags(ENV["CPPFLAGS"].split) if ENV["CPPFLAGS"]
+append_ldflags(ENV["LDFLAGS"].split) if ENV["LDFLAGS"]
+
+$LIBS = concat_flags($LIBS, ENV["LIBS"]) if ENV["LIBS"]
+
+if config_system_libraries?
+  message "Building ruby-magic using system libraries.\n"
+
+  $CPPFLAGS += " -DMAGIC_SYSTEM_LIBRARIES"
+
+  dir_config('magic')
+else
+  message "Building ruby-magic using packaged libraries.\n"
+
+  static_p = config_static?
+  message "Static linking is #{static_p ? 'enabled' : 'disabled'}.\n"
+  cross_build_p = config_cross_build?
+  message "Cross build is #{cross_build_p ? 'enabled' : 'disabled'}.\n"
+
+  libmagic_recipe = process_recipe('libmagic', LIBMAGIC_TAG, static_p, cross_build_p) do |recipe|
+    recipe.files = [{
+                      url: "https://ruby-magic.s3.eu-central-1.amazonaws.com/file-#{recipe.version}.tar.gz",
+                      sha256: LIBIMAGE_SHA256
+                    }]
+  end
+
+  $LIBPATH = [File.join(libmagic_recipe.path, 'lib')]
+  $CFLAGS << " -I#{File.join(libmagic_recipe.path, 'include')} "
+  $LDFLAGS += " -Wl,-rpath,#{libmagic_recipe.path}/lib"
+
+  if static_p
+    ENV['PKG_CONFIG_PATH'] = "#{libmagic_recipe.path}/lib/pkgconfig"
+    # mkmf appends -- to the first option
+    $LIBS += " " + pkg_config('libmagic', 'libs --static')
+    $LIBS += " " + File.join(libmagic_recipe.path, 'lib', "libmagic.#{$LIBEXT}")
+  end
+end
+
+$CFLAGS += ' -std=c99'
 
 if RbConfig::CONFIG['CC'] =~ /gcc/
   $CFLAGS += ' -O3' unless $CFLAGS =~ /-O\d/
-  $CFLAGS += ' -Wcast-qual -Wwrite-strings -Wconversion -Wmissing-noreturn -Winline'
+end
+
+%w[
+  -Wcast-qual
+  -Wwrite-strings
+  -Wconversion
+  -Wmissing-noreturn
+  -Winline
+].select do |flag|
+  try_link('int main(void) { return 0; }', flag)
+end.each do |flag|
+  $CFLAGS += " " + flag
 end
 
 unless darwin?
-  $LDFLAGS += ' -Wl,--as-needed -Wl,--no-undefined'
+  $LDFLAGS += ' -Wl,--as-needed -Wl,--exclude-libs,ALL'
 end
 
 if windows?
   $LDFLAGS += ' -static-libgcc'
 end
 
-%w[
-  CFLAGS
-  CXXFLAGS
-  CPPFLAGS
-].each do |variable|
-  $CFLAGS += format(' %s', ENV[variable]) if ENV[variable]
-end
-
-$LDFLAGS += format(' %s', ENV['LDFLAGS']) if ENV['LDFLAGS']
-
 unless have_header('ruby.h')
   abort "\n" + (<<-EOS).gsub(/^[ ]{,3}/, '') + "\n"
     You appear to be missing Ruby development libraries and/or header
@@ -188,7 +389,17 @@ end
   have_func(f)
 end
 
-dir_config('magic', [gem_include_dir], [gem_lib_dir])
-
 create_header
 create_makefile('magic/magic')
+
+if config_clean?
+  # Do not clean if run in a development work tree.
+  File.open('Makefile', 'at') do |mk|
+    mk.print(<<~EOF)
+
+      all: clean-ports
+      clean-ports: $(DLLIB)
+      \t-$(Q)$(RUBY) $(srcdir)/extconf.rb --clean --#{static_p ? 'enable' : 'disable'}-static
+    EOF
+  end
+end

data/ext/magic/functions.c

@@ -208,6 +208,14 @@ magic_errno_wrapper(magic_t magic)
 inline const char*
 magic_getpath_wrapper(void)
 {
+	/*
+	 * The second argument translates to same value as the
+	 * FILE_LOAD constant, which when used results in this
+	 * function calling the get_default_magic() internally.
+	 *
+	 * N.B. magic_getpath() also honors the "MAGIC"
+	 * environment variable."
+	 */
 	return magic_getpath(NULL, 0);
 }
 

data/ext/magic/ruby-magic.c

@@ -8,17 +8,17 @@ static int rb_mgc_do_not_auto_load;
 static int rb_mgc_do_not_stop_on_error;
 static int rb_mgc_warning;
 
-ID id_at_flags;
-ID id_at_paths;
+static ID id_at_flags;
+static ID id_at_paths;
 
-VALUE rb_cMagic = Qundef;
+static VALUE rb_cMagic = Qundef;
 
-VALUE rb_mgc_eError = Qundef;
-VALUE rb_mgc_eMagicError = Qundef;
-VALUE rb_mgc_eLibraryError = Qundef;
-VALUE rb_mgc_eParameterError = Qundef;
-VALUE rb_mgc_eFlagsError = Qundef;
-VALUE rb_mgc_eNotImplementedError = Qundef;
+static VALUE rb_mgc_eError = Qundef;
+static VALUE rb_mgc_eMagicError = Qundef;
+static VALUE rb_mgc_eLibraryError = Qundef;
+static VALUE rb_mgc_eParameterError = Qundef;
+static VALUE rb_mgc_eFlagsError = Qundef;
+static VALUE rb_mgc_eNotImplementedError = Qundef;
 
 void Init_magic(void);
 
@@ -742,6 +742,8 @@ rb_mgc_file(VALUE object, VALUE value)
 	magic_arguments_t ma;
 	const char *empty = "(null)";
 
+	UNUSED(empty);
+
 	if (NIL_P(value))
 		goto error;
 
@@ -761,7 +763,7 @@ rb_mgc_file(VALUE object, VALUE value)
 	ma.type.file.path = RVAL2CSTR(value);
 
 	MAGIC_SYNCHRONIZED(magic_file_internal, &ma);
-	if (!ma.result) {
+	if (ma.status < 0 && !ma.result) {
 		/*
 		 * Handle the case when the "ERROR" flag is set regardless of the
 		 * current version of the underlying Magic library.
@@ -777,8 +779,8 @@ rb_mgc_file(VALUE object, VALUE value)
 		 */
 		if (mo->stop_on_errors || (ma.flags & MAGIC_ERROR))
 			MAGIC_LIBRARY_ERROR(ma.cookie);
-		else
-			ma.result = magic_error_wrapper(ma.cookie);
+
+		ma.result = magic_error_wrapper(ma.cookie);
 	}
 	if (!ma.result)
 		MAGIC_GENERIC_ERROR(rb_mgc_eMagicError, EINVAL, E_UNKNOWN);
@@ -824,7 +826,7 @@ rb_mgc_buffer(VALUE object, VALUE value)
 	ma.type.buffers.sizes = (size_t *)RSTRING_LEN(value);
 
 	MAGIC_SYNCHRONIZED(magic_buffer_internal, &ma);
-	if (!ma.result)
+	if (ma.status < 0)
 		MAGIC_LIBRARY_ERROR(ma.cookie);
 
 	assert(ma.result != NULL && \
@@ -861,7 +863,7 @@ rb_mgc_descriptor(VALUE object, VALUE value)
 	MAGIC_SYNCHRONIZED(magic_descriptor_internal, &ma);
 	local_errno = errno;
 
-	if (!ma.result) {
+	if (ma.status < 0) {
 		if (local_errno == EBADF)
 			rb_raise(rb_eIOError, "Bad file descriptor");
 
@@ -931,6 +933,8 @@ nogvl_magic_file(void *data)
 	ma->result = magic_file_wrapper(ma->cookie,
 					ma->type.file.path,
 					ma->flags);
+
+	ma->status = !ma->result ? -1 : 0;
 	return NULL;
 }
 
@@ -942,6 +946,8 @@ nogvl_magic_descriptor(void *data)
 	ma->result = magic_descriptor_wrapper(ma->cookie,
 					      ma->type.file.fd,
 					      ma->flags);
+
+	ma->status = !ma->result ? -1 : 0;
 	return NULL;
 }
 
@@ -999,7 +1005,14 @@ magic_close_internal(void *data)
 static inline VALUE
 magic_load_internal(void *data)
 {
-	return (VALUE)NOGVL(nogvl_magic_load, data);
+	magic_arguments_t *ma = data;
+	int old_flags = ma->flags;
+
+	NOGVL(nogvl_magic_load, ma);
+	if (MAGIC_STATUS_CHECK(ma->status < 0))
+		magic_setflags_wrapper(ma->cookie, old_flags);
+
+	return (VALUE)NULL;
 }
 
 static inline VALUE
@@ -1018,34 +1031,46 @@ magic_load_buffers_internal(void *data)
 static inline VALUE
 magic_compile_internal(void *data)
 {
-	return (VALUE)NOGVL(nogvl_magic_compile, data);
+	magic_arguments_t *ma = data;
+	int old_flags = ma->flags;
+
+	NOGVL(nogvl_magic_compile, ma);
+	if (MAGIC_STATUS_CHECK(ma->status < 0))
+		magic_setflags_wrapper(ma->cookie, old_flags);
+
+	return (VALUE)NULL;
 }
 
 static inline VALUE
 magic_check_internal(void *data)
 {
-	return (VALUE)NOGVL(nogvl_magic_check, data);
+	magic_arguments_t *ma = data;
+	int old_flags = ma->flags;
+
+	NOGVL(nogvl_magic_check, ma);
+	if (MAGIC_STATUS_CHECK(ma->status < 0))
+		magic_setflags_wrapper(ma->cookie, old_flags);
+
+	return (VALUE)NULL;
 }
 
 static VALUE
 magic_file_internal(void *data)
 {
-	int local_errno;
-	int old_flags = 0;
-	int restore_flags = 0;
 	magic_arguments_t *ma = data;
+	int old_flags = ma->flags;
+	int restore_flags;
+	int local_errno;
 
-	if (ma->stop_on_errors) {
-		old_flags = ma->flags;
+	if (ma->stop_on_errors)
 		ma->flags |= MAGIC_ERROR;
-		restore_flags = 1;
-	}
-	if (ma->flags & MAGIC_CONTINUE) {
-		old_flags = ma->flags;
+
+	if (ma->flags & MAGIC_CONTINUE)
 		ma->flags |= MAGIC_RAW;
-		restore_flags = 1;
-	}
-	if (restore_flags && ma->flags)
+
+	restore_flags = old_flags != ma->flags;
+
+	if (restore_flags)
 		magic_setflags_wrapper(ma->cookie, ma->flags);
 
 	NOGVL(nogvl_magic_file, ma);
@@ -1057,12 +1082,10 @@ magic_file_internal(void *data)
 	 * Magic library itself, and if that does not work, then from
 	 * the saved errno value.
 	 */
-	if (magic_errno_wrapper(ma->cookie))
-		ma->status = -1;
-	else if (local_errno)
+	if (magic_errno_wrapper(ma->cookie) || local_errno)
 		ma->status = -1;
 
-	if (restore_flags && old_flags)
+	if (restore_flags)
 		magic_setflags_wrapper(ma->cookie, old_flags);
 
 	return (VALUE)NULL;
@@ -1071,23 +1094,26 @@ magic_file_internal(void *data)
 static VALUE
 magic_buffer_internal(void *data)
 {
-	int old_flags = 0;
-	int restore_flags = 0;
 	magic_arguments_t *ma = data;
+	int old_flags = ma->flags;
+	int restore_flags;
 
-	if (ma->flags & MAGIC_CONTINUE) {
-		old_flags = ma->flags;
+	if (ma->flags & MAGIC_CONTINUE)
 		ma->flags |= MAGIC_RAW;
-		restore_flags = 1;
-	}
-	if (restore_flags && ma->flags)
+
+	restore_flags = old_flags != ma->flags;
+
+	if (restore_flags)
 		magic_setflags_wrapper(ma->cookie, ma->flags);
 
 	ma->result = magic_buffer_wrapper(ma->cookie,
 					  (const void *)ma->type.buffers.pointers,
 					  (size_t)ma->type.buffers.sizes,
 					  ma->flags);
-	if (restore_flags && old_flags)
+
+	ma->status = !ma->result ? -1 : 0;
+
+	if (restore_flags)
 		magic_setflags_wrapper(ma->cookie, old_flags);
 
 	return (VALUE)NULL;
@@ -1096,21 +1122,21 @@ magic_buffer_internal(void *data)
 static VALUE
 magic_descriptor_internal(void *data)
 {
-	int old_flags = 0;
-	int restore_flags = 0;
 	magic_arguments_t *ma = data;
+	int old_flags = ma->flags;
+	int restore_flags;
 
-	if (ma->flags & MAGIC_CONTINUE) {
-		old_flags = ma->flags;
+	if (ma->flags & MAGIC_CONTINUE)
 		ma->flags |= MAGIC_RAW;
-		restore_flags = 1;
-	}
-	if (restore_flags && ma->flags)
+
+	restore_flags = old_flags != ma->flags;
+
+	if (restore_flags)
 		magic_setflags_wrapper(ma->cookie, ma->flags);
 
 	NOGVL(nogvl_magic_descriptor, ma);
 
-	if (restore_flags && old_flags)
+	if (restore_flags)
 		magic_setflags_wrapper(ma->cookie, old_flags);
 
 	return (VALUE)NULL;
@@ -1243,6 +1269,8 @@ magic_library_error(VALUE klass, void *data)
 	const char *empty = "(null)";
 	magic_t cookie = data;
 
+	UNUSED(empty);
+
 	assert(cookie != NULL && \
 	       "Must be a valid pointer to `magic_t' type");
 
@@ -1268,7 +1296,7 @@ magic_lock(VALUE object, VALUE(*function)(ANYARGS), void *data)
 	magic_object_t *mo;
 
 	MAGIC_OBJECT(mo);
-	rb_funcall(mo->mutex, rb_intern("lock"), 0, Qundef);
+	rb_funcall(mo->mutex, rb_intern("lock"), 0);
 
 	return rb_ensure(function, (VALUE)data, magic_unlock, object);
 }
@@ -1279,7 +1307,7 @@ magic_unlock(VALUE object)
 	magic_object_t *mo;
 
 	MAGIC_OBJECT(mo);
-	rb_funcall(mo->mutex, rb_intern("unlock"), 0, Qundef);
+	rb_funcall(mo->mutex, rb_intern("unlock"), 0);
 
 	return Qnil;
 }

data/ext/magic/ruby-magic.h

@@ -156,8 +156,8 @@ static const char *errors[] = {
 static inline VALUE
 magic_shift(VALUE v)
 {
-	return ARRAY_P(v) ?				       \
-		rb_funcall(v, rb_intern("shift"), 0, Qundef) : \
+	return ARRAY_P(v) ?			       \
+		rb_funcall(v, rb_intern("shift"), 0) : \
 		Qnil;
 }
 
@@ -180,8 +180,8 @@ magic_join(VALUE a, VALUE b)
 static inline VALUE
 magic_flatten(VALUE v)
 {
-	return ARRAY_P(v) ?					 \
-		rb_funcall(v, rb_intern("flatten"), 0, Qundef) : \
+	return ARRAY_P(v) ?				 \
+		rb_funcall(v, rb_intern("flatten"), 0) : \
 		Qnil;
 }
 
@@ -192,7 +192,7 @@ magic_fileno(VALUE object)
 	rb_io_t *io;
 
 	if (rb_respond_to(object, rb_intern("fileno"))) {
-		object = rb_funcall(object, rb_intern("fileno"), 0, Qundef);
+		object = rb_funcall(object, rb_intern("fileno"), 0);
 		return NUM2INT(object);
 	}
 
@@ -213,19 +213,19 @@ magic_path(VALUE object)
 		return object;
 
 	if (rb_respond_to(object, rb_intern("to_path")))
-		return rb_funcall(object, rb_intern("to_path"), 0, Qundef);
+		return rb_funcall(object, rb_intern("to_path"), 0);
 
 	if (rb_respond_to(object, rb_intern("path")))
-		return rb_funcall(object, rb_intern("path"), 0, Qundef);
+		return rb_funcall(object, rb_intern("path"), 0);
 
 	if (rb_respond_to(object, rb_intern("to_s")))
-		return rb_funcall(object, rb_intern("to_s"), 0, Qundef);
+		return rb_funcall(object, rb_intern("to_s"), 0);
 
 	return Qnil;
 }
 
 static inline void
-magic_check_type(VALUE object, int type)
+magic_check_type(VALUE object, RVALUE_TYPE type)
 {
 	VALUE boolean = Qundef;
 
@@ -250,55 +250,9 @@ magic_check_type_array_of_strings(VALUE object)
 	}
 }
 
-RUBY_EXTERN ID id_at_flags;
-RUBY_EXTERN ID id_at_paths;
-
-RUBY_EXTERN VALUE rb_cMagic;
-
-RUBY_EXTERN VALUE rb_mgc_eError;
-RUBY_EXTERN VALUE rb_mgc_eMagicError;
-RUBY_EXTERN VALUE rb_mgc_eLibraryError;
-RUBY_EXTERN VALUE rb_mgc_eParameterError;
-RUBY_EXTERN VALUE rb_mgc_eFlagsError;
-RUBY_EXTERN VALUE rb_mgc_eNotImplementedError;
-
-RUBY_EXTERN VALUE rb_mgc_get_do_not_auto_load_global(VALUE object);
-RUBY_EXTERN VALUE rb_mgc_set_do_not_auto_load_global(VALUE object,
-						     VALUE value);
-
-RUBY_EXTERN VALUE rb_mgc_get_do_not_stop_on_error_global(VALUE object);
-RUBY_EXTERN VALUE rb_mgc_set_do_not_stop_on_error_global(VALUE object,
-							 VALUE value);
-
-RUBY_EXTERN VALUE rb_mgc_initialize(VALUE object, VALUE arguments);
-
-RUBY_EXTERN VALUE rb_mgc_get_do_not_stop_on_error(VALUE object);
-RUBY_EXTERN VALUE rb_mgc_set_do_not_stop_on_error(VALUE object, VALUE value);
-
-RUBY_EXTERN VALUE rb_mgc_open_p(VALUE object);
-RUBY_EXTERN VALUE rb_mgc_close(VALUE object);
-RUBY_EXTERN VALUE rb_mgc_close_p(VALUE object);
-
-RUBY_EXTERN VALUE rb_mgc_get_paths(VALUE object);
-
-RUBY_EXTERN VALUE rb_mgc_get_parameter(VALUE object, VALUE tag);
-RUBY_EXTERN VALUE rb_mgc_set_parameter(VALUE object, VALUE tag, VALUE value);
-
-RUBY_EXTERN VALUE rb_mgc_get_flags(VALUE object);
-RUBY_EXTERN VALUE rb_mgc_set_flags(VALUE object, VALUE value);
-
-RUBY_EXTERN VALUE rb_mgc_load(VALUE object, VALUE arguments);
-RUBY_EXTERN VALUE rb_mgc_load_buffers(VALUE object, VALUE arguments);
-RUBY_EXTERN VALUE rb_mgc_load_p(VALUE object);
-
-RUBY_EXTERN VALUE rb_mgc_compile(VALUE object, VALUE arguments);
-RUBY_EXTERN VALUE rb_mgc_check(VALUE object, VALUE arguments);
-
-RUBY_EXTERN VALUE rb_mgc_file(VALUE object, VALUE value);
-RUBY_EXTERN VALUE rb_mgc_buffer(VALUE object, VALUE value);
-RUBY_EXTERN VALUE rb_mgc_descriptor(VALUE object, VALUE value);
-
-RUBY_EXTERN VALUE rb_mgc_version(VALUE object);
+VALUE rb_mgc_close_p(VALUE object);
+VALUE rb_mgc_load(VALUE object, VALUE arguments);
+VALUE rb_mgc_descriptor(VALUE object, VALUE value);
 
 #if defined(__cplusplus)
 }

data/lib/magic/version.rb

@@ -4,7 +4,7 @@ class Magic
   #
   # Current version of _Magic_.
   #
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 
   class << self
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-magic
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Krzysztof Wilczyński
@@ -9,8 +9,22 @@ autorequire:
 bindir: bin
 cert_chain:
 - kwilczynski-public.pem
-date: 2021-03-25 00:00:00.000000000 Z
-dependencies: []
+date: 2021-04-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.5.0
 description: |
   File Magic in Ruby.
 
@@ -23,11 +37,11 @@ extra_rdoc_files: []
 files:
 - AUTHORS
 - CHANGELOG.md
+- CONTRIBUTORS.md
 - COPYRIGHT
 - LICENSE
 - NOTICE
 - README.md
-- VERSION
 - ext/magic/common.h
 - ext/magic/extconf.rb
 - ext/magic/functions.c

data/VERSION

@@ -1 +0,0 @@
-0.3.1