MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-02 10:08:56 +02:00
Code Issues Releases Wiki Activity

ircd::magic: Minor cleanup/reorg.

Browse source
This commit is contained in:
Jason Volk 2020-04-19 16:47:54 -07:00
parent 764a723704
commit 2b5c6bfd12
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
ircd/magic.cc
View file

@ -12,18 +12,15 @@
namespace ircd::magic
{
magic_t cookie;
// magic_getflags() may not be available; this will supplement for our
// tracking of their flags state.
int flags{MAGIC_NONE};
extern const char *const fallback_paths[]
extern magic_t cookie;
extern int flags;
static void version_check();
static void throw_on_error(const magic_t &);
static void set_flags(const magic_t &, const int &flags);
static string_view call(const magic_t &, const int &flags, const mutable_buffer &, const std::function<const char *()> &);
static string_view call(const magic_t &, const int &flags, const mutable_buffer &, const const_buffer &);
static void version_check();
}
decltype(ircd::magic::version_api)
@ -38,6 +35,30 @@ ircd::magic::version_abi
"magic", info::versions::ABI, ::magic_version()
};
decltype(ircd::magic::fallback_paths)
ircd::magic::fallback_paths
{
"/usr/local/share/misc/magic.mgc",
"/usr/share/misc/magic.mgc",
"/usr/share/file/misc/magic.mgc",
nullptr
};
decltype(ircd::magic::cookie)
ircd::magic::cookie;
// magic_getflags() may not be available; this will supplement for our
// tracking of their flags state.
decltype(ircd::magic::flags)
ircd::magic::flags
{
MAGIC_NONE
};
//
// init
//
ircd::magic::init::init()
{
version_check();
@ -45,15 +66,6 @@ ircd::magic::init::init()
if(unlikely(!(cookie = ::magic_open(flags))))
throw error{"magic_open() failed"};
//TODO: conf; TODO: windows
static const char *const paths[]
{
"/usr/local/share/misc/magic.mgc",
"/usr/share/misc/magic.mgc",
"/usr/share/file/misc/magic.mgc",
nullptr
};
for(const char *const *path{paths}; *path; ++path)
if(fs::exists(*path))
if(magic_check(cookie, *path) == 0)
@ -72,6 +84,10 @@ noexcept
::magic_close(cookie);
}
//
// interface
//
ircd::string_view
ircd::magic::description(const mutable_buffer &out,
const const_buffer &buffer)