From 8ec2f004487e567b5300187322eebbd6975cd074 Mon Sep 17 00:00:00 2001 From: TheAssassin Date: Sun, 3 Jun 2018 03:07:23 +0200 Subject: [PATCH] Add error string to exception messages --- src/util/magicwrapper.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/util/magicwrapper.cpp b/src/util/magicwrapper.cpp index 24a745a..0f08395 100644 --- a/src/util/magicwrapper.cpp +++ b/src/util/magicwrapper.cpp @@ -14,10 +14,10 @@ namespace linuxdeploy { public: PrivateData() noexcept(false) { - cookie = magic_open(MAGIC_DEBUG | MAGIC_SYMLINK | MAGIC_MIME_TYPE); + cookie = magic_open(MAGIC_CHECK | MAGIC_MIME_TYPE | MAGIC_MIME_ENCODING); if (cookie == nullptr) - throw MagicError("Failed to open magic database"); + throw MagicError("Failed to open magic database: " + std::string(magic_error(cookie))); } ~PrivateData() { @@ -40,7 +40,7 @@ namespace linuxdeploy { const auto* buf = magic_file(d->cookie, path.c_str()); if (buf == nullptr) - return ""; + throw MagicError("magic_file() failed: " + std::string(magic_error(d->cookie))); return buf; }