ruby-magic 0.4.0 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ec6d5053457e958f459236e45b56c3e4f85dd16e8c09f119208619db7332982
-  data.tar.gz: 01bd34ae0c013438354e440ab533f2b8bce0bd693df874043181a365b1980fe3
+  metadata.gz: 62a636b8ebb83354f9cd8ae8f25a97c9b451765687f5c4289bd44e6f1b729035
+  data.tar.gz: 79509714217a030267ae86277fbff57eceb8466a51b89514a6ba7b996d18f94b
 SHA512:
-  metadata.gz: d41cbbfec82e392dfe5db7d30d51814f852def72c09f766c4cf9f007272fb256fb4669db02963a8c7fc185c4ecbb83d22873e70fadc89fd63ed0098e5a7397f2
-  data.tar.gz: 8537e862c2b421ccf2d301d0a8811f02112f35c53061d3565d15601264e082e61184af80f866dc37a186101268c99684ada8b6949ab7feea81baf02e97f2dee3
+  metadata.gz: 2ba1b598ffbe702fa9467598fd44d9e9ae66beef318120092a597fe8ad08bec10a912c0f0b40609f3b08c8ec266f414048db0befa6c348eda1eab2c17af5bb41
+  data.tar.gz: bea167c85a64f0463e46987a690ee4aa0d00424eaa41f815898f57652d61c52455867b3df39d5ea5d35e529bc3a8176f8ed10021c9112f856d3b556ed4191767

data/CHANGELOG.md

@@ -7,6 +7,44 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [0.5.3] - 2021-12-22
+
+### Fixed
+
+- ext: load C extension files from non-native gems via "require"
+
+## [0.5.2] - 2021-11-20
+
+- No changes
+
+## [0.5.1] - 2021-11-20
+
+### Fixed
+
+- Check for pkg-config when building static libraries.
+
+## [0.5.0] - 2021-09-30
+
+### Added
+
+- Introduce support for building native gems.
+
+### Changed
+
+- Relax mini_portile2 dependency.
+- Use RB_ALLOC() over calling ruby_xmalloc() directly
+- Address warnings reported by cppcheck.
+- Address code style that checkpatch.pl script reported.
+- Fix how flags are set for the open() function.
+- Clean up type definitions.
+- Add alias Magic::mime_type for Magic::mime.
+ - Make magic_set_flags() return void as its return value was never used.
+
+### Fixed
+
+- Fix truffleruby test failure
+- Fix --use-system-libraries not working with Rake install
+
 ## [0.2.0] - 2015-03-25
 ### Added
 

data/CONTRIBUTORS.md

@@ -7,10 +7,9 @@ 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.
 
-
-- Mike Dalessio ([@flavorjones](https://github.com/flavorjones))
 - Igor Victor ([@gogainda](https://github.com/gogainda))
 - John Hawthorn ([@jhawthorn](https://github.com/jhawthorn))
+- Mike Dalessio ([@flavorjones](https://github.com/flavorjones))
 - Shinya Maeda ([@dosuken123](https://github.com/dosuken123))
 - Stan Hu ([@stanhu](https://github.com/stanhu))
 

data/dependencies.yml

@@ -14,80 +14,9 @@ libmagic:
   #
   #  Using this PGP signature:
   #
-  #    -----BEGIN PGP PUBLIC KEY BLOCK-----
-  #    mQGiBEg60Q8RBAC89+Oyi+iU1dMftAqXKh9Ml2PDCRk+Q6gwSY2BwmnKrPYvLSx9/YApjDp4
-  #    BzhjaMCiDtDkbVDO3JuLQqUsCUWRJr9UxgfkQPMx3obkgoyCCvUcG5eK9CHeztjz5UK3jOzD
-  #    939UtupUXs+5z4dK1oAFFEL3sV6m5O4cuHyeWpjLCwCg9LYwmG2wIB65/2619W2kRMShDwkD
-  #    /1KweB5mmXdQCDpzSg02Q4kGOzWmN2Dpv5kvKd9Lj/qxkj5PFOJ56Rmm04K0lPE6AnDgvEeu
-  #    SqO8pkA8OY5IQNIjlgg3tshoMBRdsj9JLKv67smQXy01eQmadJWoiIZFuSLX7nrRLm3x3i1K
-  #    4/tcKorXoD5QBgOWaYFzkOcQ5jrwA/9tn0MEkkVqez88xGhOjq6jooRWrP2lhNWb+Q7ayEvW
-  #    9Wm9CYS0dXxlCCJfqBOc+cZo8iVVbqiOzwAQ7uAAUv8azuaeRWpOD7MSjkXjYtkPwZevEd6x
-  #    FKODaB2BDO4WMlxO9mp3Q/gPfrM41v9n33tYsAzQMW7c9W5mX/XH2Cv/57QyQ2hyaXN0b3Mg
-  #    Wm91bGFzIChOZXRCU0Qga2V5KSA8Y2hyaXN0b3NAbmV0YnNkLm9yZz6IXgQQEQgABgUCWcg8
-  #    UAAKCRCWb7A7gPrCzP43AP9pxzM85lwZxHRG8vPw16wWUYGcGW44g/u1zqavRUksvgD/fX1y
-  #    6+cj5kNEqp5bHgCvOJiSYADIUQaPTYbwMvnQ1IuIZAQTEQIAJAIbAwYLCQgHAwIDFQIDAxYC
-  #    AQIeAQIXgAUCV7RsLgUJIkWeFwAKCRBxESqxbLM7Oi/LAKC1PdNLcoP06p6nsGh4ApH0gkSl
-  #    fgCg7k7lwLPdN0djOMUPMFnqN+TYAoaIZAQTEQIAJAUCSDrTKgIbAwUJDwmcAAYLCQgHAwID
-  #    FQIDAxYCAQIeAQIXgAAKCRBxESqxbLM7OqXeAJ9tkhVpTsdkix5oWzsBCbU4vHO2CACfbd8k
-  #    PWR68VgvDK5RPQchyghfIZGJARwEEAECAAYFAlnOXIQACgkQWrHF/qWWAmTEhggAmTr9PxSU
-  #    wQ8dAvno6I30mDY+r4V2FaD+WvhITDV/CYfU4ImDCfknDC1x4f44YAgN94YQfnTmAixWLLk9
-  #    NhvgKWHg5Sq2p7S3hLe3hQHUu+4mHq2t+oBtiwnb+GPUAz3ko1hjQ2fN3nZdwKNA3P37NJuj
-  #    EiXOR1UsxO8TaTuf/mB+9vdrUpHsgRaZwYIJ7oszkRkr2V82QsMwgcIdnCPEVY7q+foi2DUF
-  #    UW3eujRLpW9M/NUXrA8f2wQZVaLNy+Zpai57uXW7bVRc82+uRDVwckhKq+YRpfRiD/JCWzKP
-  #    AJJfabUkKiA6NUe51aQJm64BUKh7p8ZR4qjCr/Roofsh9okCHAQQAQIABgUCWduxXQAKCRBm
-  #    Bw6ljCki37ulD/4iZ9hjimgichG5F5Ht2CfPx3Qm16QYjnuB2l7FZNPYlcThdNgjJjc4Wro3
-  #    jrcfj6KMTGXnkRuY7794co6z/U/x9sVz9wQYr0ugrJsVQeHRWbJGl2vFhOOtgj9hfJQM44nz
-  #    3ZZR4VDh/KU4njBhPR1Mzxoop1WBnWcE9RpTIyMlaB6RK9I8JGOpvNYzQaODnsG7z144G/3W
-  #    gIWZnjVVozv/szvtabd+L1N3hMPI2jNkmKWSGuZWdIIcPBEp2e9AYmb9mVhp8UanrMWVTUi0
-  #    q7Cc0Jw4tkTwXYaEeRcbbB87p+IV0an7o+m9e2hrdZJan276tDOFe+HgcZ4NiEM8LTcOBIHn
-  #    VWaRLwQD4AAB8zmMHiVTN3oUdQsYlZmHhBYv8Bkfzwi8JdxMq7V2zGntQnROl9Ust3qL8g28
-  #    xI/dzt396qupywaF/2bUKyZx/079Y3eEluPQlU+iof+hJ2roetJNwMzs/hTDLQgI4T8ZhsMO
-  #    MewZUVI59YrqjETR1U6+L9txmULgL16jBpLqvFBGhUOIDqjI5uxapEjCGy3inocjUeejy5iN
-  #    PehQwt2TKC2Exsyd02kJrPErYVcMLYbO90d2ykBItoSXsDcuOTgfyxpvxTUih4tHVf5B69Ht
-  #    HAPPYqSEfwlVazLnoe/z5KU2h415vcwuRuI1WU0ghdGFCMmH1rQ0Q2hyaXN0b3MgWm91bGFz
-  #    IChwZXJzb25hbCBrZXkpIDxjaHJpc3Rvc0B6b3VsYXMuY29tPoheBBARCAAGBQJZyDxEAAoJ
-  #    EJZvsDuA+sLMa3oA/Rub7s6Vp61CJ4kDTyfAJg0vL2Y6dqb0l1qZfg7kHWDTAQDK85IGzegN
-  #    dAftzh5ZBgOOByQ8C8nprbxQWNTKXwWBH4hkBBMRAgAkAhsDBgsJCAcDAgMVAgMDFgIBAh4B
-  #    AheABQJXtGwxBQkiRZ4XAAoJEHERKrFsszs6XGUAn2mngFtwV1va2adBDUrx4ZpXHQNBAJ9w
-  #    EZ8bIqAmyTrAE8r0iOXe1bzWrIhkBBMRAgAkBQJIOtEPAhsDBQkPCZwABgsJCAcDAgMVAgMD
-  #    FgIBAh4BAheAAAoJEHERKrFsszs63YcAnRjURIBsnyKeY+f6jO8pVYx499LHAJwP4h+X2i+r
-  #    drCNiSYYVCYbkNjysokBHAQQAQIABgUCWc5chAAKCRBascX+pZYCZA6bCACAB7DFdL0DfXUU
-  #    +BTcJQXvlD9fKBoGmonUACPX/wq7phmnvJL0Btl1KJlcLuiu94PgLPXH4nWwpGnWG2Ogigqf
-  #    HxM4Jx6skqkBQI6npacTU1nSaIBW4hKZpo/6QvgjmO1wsSPemIvZ/8+ijfS5AHPh0gew3BFj
-  #    ESPvwWxxode3zDKD5n6g1vU4Id9i0OqjUUkUnCBy8pz6b/n3VuyYXM+OnMgZw+tXfYUJkf3v
-  #    15gWhXlmpeLCPdmSZ8NRy80lrY45EHra2lPx3RgX88AF3cgwLrKfjLRc1yuSZ1mipT+pI1Fs
-  #    uUe14XfXHiLM2ESp2HLDLmCY8lwYelmWPO76skwEiQIcBBABAgAGBQJZ27FdAAoJEGYHDqWM
-  #    KSLft9UP/3ZxzMkr2m8/itBLOBJbMlvCb5gfZLHrQV/GF9OIDDSdu0+4cbbVqeXyg4tEQHHi
-  #    8Gr9WZI3CgqWbJN66NkKnaPqZ4RE7a98h9AvRxWsGhBI+I8r8LTlsQQrhjUyEinsr7oqNP9M
-  #    SO7vicg6df5SuWmQxTrap8A1noX6O0djzJ9Ea721hCHDxGQ9nxCAPOIvS7lI06soNLuuTdp+
-  #    E+r1d3+saHGU6YK8GsnqFSTdxb9WBUJU8BQpcI9kL3iIGA8Azw6L5CFra9InCCQIjzHIbL/r
-  #    WLIJKxJicHJib009atUeLDCwmdaLHoqOkqOJIYrnbbEkPQunY6A68KkNx05N5p46eRwKxKA0
-  #    TJQAMyzdkCYKaiQe+pETwsyO89P9RK84P5wCG4jqSe29JW7VeuBOQDJ3khBN3whDu9s5gVlh
-  #    UGjIeLo85g7IIKTtv5fbopAUCjbVwccqws54PmiSqTy5OlOCbbYGDtoermnXME+sFcNRT8MI
-  #    ktWShC6GrF1BhVrS4ex9e6jsQxKQRMlab2bBeJ6rUXT/i8cnpJERViPspDvVgL7Oer+K2gep
-  #    uNa2DeCaNardaAYo2IYu985pqRZYJVTCydmX+Wlhfp12tzToW1/9QsLTvKUhuI0WB/cC839t
-  #    lJRXapfKjwjj91VEX7Y26vHWli5noHMSNIRlIjT5RqouuQQNBEg60jMQEADIcUV/L4XmXXqj
-  #    GvglW2ZAPn/FIm+N4GM/vTjxUXAc2ciiIsTDuO+1+e4sB9eN05rcvtTyt28W6N6hL8HfQIFq
-  #    5WEsd86vd+cSiBlisq1BglNgFiAfRy/guoLHiYnBlSdS6/Gab86zR4m6Bg1JZOcV0c9Irffv
-  #    5XLlT/LX45V46ju3PQSJYGboKdEaX4jUWcSQgUQ4+HyyP2DsWPyfrJj4sFA0T78b1ywsyKK2
-  #    OOv7KUQk/Hwq2C68aG6YlvvVKywucoSX2uk0ZnWjCCwgOtXxyHIysqAxcz9IPRbtJ3PjjScM
-  #    kv9NMrb5SDswwZy1vfL8s1sa8w7uZgXlpOaFb/yYMuzvwKRwJNxptVW0TTcZ8ADemRiHgDzJ
-  #    0MbXYcmSH8CXla746Bg7oXaCMPvfivOnIsj/6d3YZPT1enwBprgL3VqlWPA4fjWyMh6+BoHu
-  #    ak7Q4k2h2sSXo29tR6KXYbc+K+qUB+QrjGDkOL6JqN5nBLiu3H95B7ZEm8wDoYitDpt7ot9S
-  #    5ja+dcNyUu+XXUGXvc8SvzEmsDKMqxZSxvCyIfPhaFxVylLK02fhfXqpBImvZ6UmHOzylNlk
-  #    TqJzDG4LOOiC/knv7ypgr7VH8TJ2PD9p2IR79hKjnVGmYvTtZ132qda+erbNb/9wwAzOeG49
-  #    fgdiDSsUmvl15kEI+gBtZwADBQ/+PuZa9CEKryZpQ6hczzAN8oksk7MQaTBYdAd62zfaNa/Q
-  #    QID3P5I8FsdXMCcKRipP95cZY8ZQKjBGt7O26Ts955Q71QS58rCXxeLP9/mbpm3kCwXrAkZH
-  #    s2rH2awLOg6p8at2NJCn56AkldK1PyVtL0Qvl7nEOe+lcULqfLNEbGEgzev+ZK0v6So6lA2t
-  #    i8derF5XkIMzCFdjcC1reZvfwNnxd/pQzuMfZOfPjPD6OKaBEWnWNZscU/ucNkgQpv+M2hCA
-  #    paC3NaNiXl0TWsDp7981WSWnf6YZRTjLKyObdGmpo7Z+C9uVu2DbRlUiRAD3azBo4t03EZVB
-  #    XMo/1opuqxyU6FLVW0mxLI2wh2M1Jt/RAvXLm5/Z9zGnPqwAObxkA518e71QXyM+GQ+M8Kyp
-  #    PHr00oC+32PrKnFADI3s1oK5zMX0tjXb0voAgXTWNFsmi+efj7A3wt6G15ai70pOSTuFl9kb
-  #    BqmCI4NmD5wV+uIR/jcmTf7jZKX5QPjDSJddJ5EeAsPXtur0wFZ9JwPM2FyNaeL92BjRYQPW
-  #    C9vRtAUjJa2PSLofMDaEs+VD76WRI3E8kPIJiFeSqOLinclo1e41q3nyj5JBnwg50CwshW7g
-  #    w/bU+IbzL0eZFjJ7ftJ+Xi/vlGtfbxjuKuhyD2PM3DNf9uXmcIV4ldEJzwhw2KmITwQYEQIA
-  #    DwIbDAUCV7RsRgUJIkWdEAAKCRBxESqxbLM7OiJUAJ4y0+A//pOrp3rjo28Uyt34U+qRqwCe
-  #    NqiZtKbSqpUgcLmKNgot+mSEAmmITwQYEQIADwUCSDrSMwIbDAUJDwmcAAAKCRBxESqxbLM7
-  #    OnaqAJ0cUAs8+EPXqRYYbdu6ROINhExMkwCgpupi6uEG+b4yo6M+VlcQY7gl2DE=
-  #    =XrDo
-  #    -----END PGP PUBLIC KEY BLOCK-----
+  #    -----BEGIN PGP SIGNATURE-----
+  #
+  #    iEYEABECAAYFAl7mu3AACgkQcREqsWyzOzppXACgoqokKabq7bwN9aKvd/H/yhF+
+  #    9PUAoOPrAtxFkfNUvtqK/trY+v/Gk5JM
+  #    =tA6a
+  #    -----END PGP SIGNATURE-----

data/ext/magic/common.h

@@ -87,11 +87,13 @@ extern "C" {
 #define ARRAY_P(x)   (RB_TYPE_P((x), T_ARRAY))
 #define FILE_P(x)    (RB_TYPE_P((x), T_FILE))
 
-#define RVAL2CBOOL(x) (RTEST(x))
-#define CBOOL2RVAL(x) ((x) ? Qtrue : Qfalse)
+#define RVAL2CBOOL(b) (RTEST(b))
+#define CBOOL2RVAL(b) ((b) ? Qtrue : Qfalse)
 
-#define RVAL2CSTR(x) (NIL_P(x) ? NULL : StringValueCStr(x))
-#define CSTR2RVAL(x) ((x) == NULL ? Qnil : rb_str_new2(x))
+#define RVAL2CSTR(s) (NIL_P(s) ? NULL : StringValueCStr(s))
+#define CSTR2RVAL(s) ((s) == NULL ? Qnil : rb_str_new2((const char *)s))
+
+#define RSTRING_EMPTY_P(s) (RSTRING_LEN(s) == 0)
 
 #define RARRAY_EMPTY	  rb_ary_new()
 #define RARRAY_EMPTY_P(a) (RARRAY_LEN(a) == 0)
@@ -126,7 +128,7 @@ extern "C" {
 # define FPTR_TO_FD(p) (fileno(GetReadFile(p)))
 #endif /* GetReadFile */
 
-#define NOGVL_FUNCTION (VALUE (*)(void *))
+#define NOGVL_FUNCTION (VALUE(*)(void *))
 
 #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) && \
     defined(HAVE_RUBY_THREAD_H) && HAVE_RUBY_THREAD_H
@@ -151,8 +153,10 @@ fake_blocking_region(VALUE (*f)(ANYARGS), void *data)
 }
 # define NOGVL(f, d) \
 	fake_blocking_region(NOGVL_FUNCTION(f), (d))
-#endif /* HAVE_RB_THREAD_CALL_WITHOUT_GVL
-	  HAVE_RUBY_THREAD_H */
+#endif /*
+	* HAVE_RB_THREAD_CALL_WITHOUT_GVL
+	* HAVE_RUBY_THREAD_H
+	*/
 
 #if defined(__cplusplus)
 }

data/ext/magic/extconf.rb

@@ -9,7 +9,7 @@ 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"
+REQUIRED_MINI_PORTILE_VERSION = "~> 2.6"
 
 MAGIC_HELP_MESSAGE = <<~HELP
   USAGE: ruby #{$0} [options]
@@ -298,9 +298,21 @@ else
   if static_p
     ENV['PKG_CONFIG_PATH'] = "#{libmagic_recipe.path}/lib/pkgconfig"
     # mkmf appends -- to the first option
-    $LIBS += " " + pkg_config('libmagic', 'libs --static')
+    pkg_config_flags = pkg_config('libmagic', 'libs --static')
+
+    raise 'Please install the `pkg-config` utility' unless pkg_config_flags
+
+    $LIBS += " " + pkg_config_flags
     $LIBS += " " + File.join(libmagic_recipe.path, 'lib', "libmagic.#{$LIBEXT}")
   end
+
+  if cross_build_p
+    # database files will be packaged up by the cross-compiling callback in the ExtensionTask
+    to_path = File.join(PACKAGE_ROOT_DIR, "ext/magic/share")
+    FileUtils.rm_rf(to_path, secure: true)
+    FileUtils.mkdir(to_path)
+    FileUtils.cp_r(Dir[File.join(libmagic_recipe.path, 'share/misc/*.mgc')], to_path)
+  end
 end
 
 $CFLAGS += ' -std=c99'
@@ -371,6 +383,13 @@ unless have_header('ruby.h')
   EOS
 end
 
+# these are needed for `rb_thread_call_without_gvl` to be properly detected on some linux systems.
+# specifically, rake-compiler-dock's redhat-based image needs these.
+have_library('pthread')
+have_library('rt')
+have_library('dl')
+have_library('crypt')
+
 have_func('rb_thread_call_without_gvl')
 have_func('rb_thread_blocking_region')
 

data/ext/magic/functions.c

@@ -4,14 +4,14 @@ extern "C" {
 
 #include "functions.h"
 
-int check_fd(int fd);
+static int check_fd(int fd);
 static int safe_dup(int fd);
 static int safe_close(int fd);
 static int safe_cloexec(int fd);
-int override_error_output(void *data);
-int restore_error_output(void *data);
+static int override_error_output(void *data);
+static int restore_error_output(void *data);
 
-inline int
+static inline int
 check_fd(int fd)
 {
 	errno = 0;
@@ -42,6 +42,7 @@ safe_dup(int fd)
 			goto error;
 		}
 	}
+
 	if (safe_cloexec(new_fd) < 0) {
 		local_errno = errno;
 		goto error;
@@ -78,6 +79,7 @@ safe_cloexec(int fd)
 		local_errno = errno;
 		goto error;
 	}
+
 	if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) < 0) {
 		local_errno = errno;
 		goto error;
@@ -89,18 +91,18 @@ error:
 	return -1;
 }
 
-int
+static int
 override_error_output(void *data)
 {
 	int local_errno;
-	mode_t mode = S_IRWXU | S_IRWXG | S_IRWXO;
+	int flags = O_WRONLY | O_APPEND;
 	save_t *s = data;
 
 #if defined(HAVE_O_CLOEXEC)
-	mode |= O_CLOEXEC;
+	flags |= O_CLOEXEC;
 #endif
 
-	assert(s != NULL && \
+	assert(s != NULL &&
 	       "Must be a valid pointer to `save_t' type");
 
 	s->file.old_fd = -1;
@@ -116,7 +118,7 @@ override_error_output(void *data)
 		goto error;
 	}
 
-	s->file.new_fd = open("/dev/null", O_WRONLY | O_APPEND, mode);
+	s->file.new_fd = open("/dev/null", flags, 0222);
 	if (s->file.new_fd < 0) {
 		local_errno = errno;
 
@@ -128,10 +130,12 @@ override_error_output(void *data)
 		safe_close(s->file.old_fd);
 		goto error;
 	}
+
 	if (safe_cloexec(s->file.new_fd) < 0) {
 		local_errno = errno;
 		goto error;
 	}
+
 	if (dup2(s->file.new_fd, fileno(stderr)) < 0) {
 		local_errno = errno;
 		goto error;
@@ -146,13 +150,13 @@ error:
 	return -1;
 }
 
-int
+static int
 restore_error_output(void *data)
 {
 	int local_errno;
 	save_t *s = data;
 
-	assert(s != NULL && \
+	assert(s != NULL &&
 	       "Must be a valid pointer to `save_t' type");
 
 	if (s->file.old_fd < 0 && s->status != 0)
@@ -278,15 +282,21 @@ inline int
 magic_load_wrapper(magic_t magic, const char *magic_file, int flags)
 {
 	int rv;
+
 	MAGIC_FUNCTION(magic_load, rv, flags, magic, magic_file);
+
 	return rv;
 }
 
 inline int
-magic_load_buffers_wrapper(magic_t magic, void **buffers, size_t *sizes, size_t count, int flags)
+magic_load_buffers_wrapper(magic_t magic, void **buffers, size_t *sizes,
+			   size_t count, int flags)
 {
 	int rv;
-	MAGIC_FUNCTION(magic_load_buffers, rv, flags, magic, buffers, sizes, count);
+
+	MAGIC_FUNCTION(magic_load_buffers, rv, flags, magic, buffers, sizes,
+		       count);
+
 	return rv;
 }
 
@@ -294,7 +304,9 @@ inline int
 magic_compile_wrapper(magic_t magic, const char *magic_file, int flags)
 {
 	int rv;
+
 	MAGIC_FUNCTION(magic_compile, rv, flags, magic, magic_file);
+
 	return rv;
 }
 
@@ -302,15 +314,19 @@ inline int
 magic_check_wrapper(magic_t magic, const char *magic_file, int flags)
 {
 	int rv;
+
 	MAGIC_FUNCTION(magic_check, rv, flags, magic, magic_file);
+
 	return rv;
 }
 
 inline const char*
-magic_file_wrapper(magic_t magic, const char* filename, int flags)
+magic_file_wrapper(magic_t magic, const char *filename, int flags)
 {
 	const char *cstring;
+
 	MAGIC_FUNCTION(magic_file, cstring, flags, magic, filename);
+
 	return cstring;
 }
 
@@ -318,7 +334,9 @@ inline const char*
 magic_buffer_wrapper(magic_t magic, const void *buffer, size_t size, int flags)
 {
 	const char *cstring;
+
 	MAGIC_FUNCTION(magic_buffer, cstring, flags, magic, buffer, size);
+
 	return cstring;
 }
 

data/ext/magic/functions.h

@@ -9,7 +9,7 @@ extern "C" {
 
 #define MAGIC_FUNCTION(f, r, x, ...)			 \
 	do {						 \
-		if ((x) & MAGIC_DEBUG)			 \
+		if ((x) & (MAGIC_DEBUG | MAGIC_CHECK))   \
 			r = f(__VA_ARGS__);		 \
 		else {					 \
 			save_t __##f;			 \
@@ -17,7 +17,7 @@ extern "C" {
 			r = f(__VA_ARGS__);		 \
 			restore_error_output(&(__##f));  \
 		}					 \
-	} while(0)
+	} while (0)
 
 typedef struct file_data {
 	fpos_t position;
@@ -33,30 +33,36 @@ typedef struct save {
 extern magic_t magic_open_wrapper(int flags);
 extern void magic_close_wrapper(magic_t magic);
 
-extern const char* magic_error_wrapper(magic_t magic);
+extern const char *magic_error_wrapper(magic_t magic);
 extern int magic_errno_wrapper(magic_t magic);
 
-extern const char* magic_getpath_wrapper(void);
+extern const char *magic_getpath_wrapper(void);
 
-extern int magic_getparam_wrapper(magic_t magic, int parameter, void *value);
+extern int magic_getparam_wrapper(magic_t magic, int parameter,
+				  void *value);
 extern int magic_setparam_wrapper(magic_t magic, int parameter,
 				  const void *value);
 
 extern int magic_getflags_wrapper(magic_t magic);
 extern int magic_setflags_wrapper(magic_t magic, int flags);
 
-extern int magic_load_wrapper(magic_t magic, const char *magic_file, int flags);
+extern int magic_load_wrapper(magic_t magic, const char *magic_file,
+			      int flags);
 extern int magic_load_buffers_wrapper(magic_t magic, void **buffers,
-				      size_t *sizes, size_t count, int flags);
+				      size_t *sizes, size_t count,
+				      int flags);
 
-extern int magic_compile_wrapper(magic_t magic, const char *magic_file, int flags);
-extern int magic_check_wrapper(magic_t magic, const char *magic_file, int flags);
+extern int magic_compile_wrapper(magic_t magic, const char *magic_file,
+				 int flags);
+extern int magic_check_wrapper(magic_t magic, const char *magic_file,
+			       int flags);
 
-extern const char* magic_file_wrapper(magic_t magic, const char *filename,
+extern const char *magic_file_wrapper(magic_t magic, const char *filename,
 				      int flags);
-extern const char* magic_buffer_wrapper(magic_t magic, const void *buffer,
+extern const char *magic_buffer_wrapper(magic_t magic, const void *buffer,
 					size_t size, int flags);
-extern const char* magic_descriptor_wrapper(magic_t magic, int fd, int flags);
+extern const char *magic_descriptor_wrapper(magic_t magic, int fd,
+					    int flags);
 
 extern int magic_version_wrapper(void);