Remove some Linux hacks that I can't see the point of any more.

[dcpomatic.git] / src / lib / cross_linux.cc

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 7b807a44120ac10d62fc249896ac6fd894eb69bd..2d43d38019c7d2697af5fb498b3894be60d7724d 100644 (file)
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -33,7 +33,7 @@ extern "C" {
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 #include <boost/function.hpp>
-#ifdef DCPOMATIC_DISK
+#if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
 #endif
 #include <unistd.h>
@@ -99,21 +99,35 @@ cpu_info ()
 }
 
 boost::filesystem::path
-shared_path ()
+resources_path ()
 {
-       char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
-       if (p) {
-               return p;
-       }
-       return boost::filesystem::canonical (LINUX_SHARE_PREFIX);
+       return directory_containing_executable().parent_path() / "share" / "dcpomatic2";
 }
 
+
+boost::filesystem::path
+xsd_path ()
+{
+       return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
+}
+
+
+boost::filesystem::path
+tags_path ()
+{
+       return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags";
+}
+
+
 void
 run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
 {
        string ffprobe = "ffprobe \"" + content.string() + "\" 2> \"" + out.string() + "\"";
        LOG_GENERAL (N_("Probing with %1"), ffprobe);
-        system (ffprobe.c_str ());
+       int const r = system (ffprobe.c_str());
+       if (r == -1 || (WIFEXITED(r) && WEXITSTATUS(r) != 0)) {
+               LOG_GENERAL (N_("Could not run ffprobe (system returned %1"), r);
+       }
 }
 
 list<pair<string, string> >
@@ -157,7 +171,12 @@ directory_containing_executable ()
 boost::filesystem::path
 openssl_path ()
 {
-       return directory_containing_executable() / "dcpomatic2_openssl";
+       boost::filesystem::path p = directory_containing_executable() / "dcpomatic2_openssl";
+       if (boost::filesystem::is_regular_file(p)) {
+               return p;
+       }
+
+       return "dcpomatic2_openssl";
 }
 
 
@@ -371,9 +390,10 @@ unprivileged ()
        uid_t ruid, euid, suid;
        if (getresuid(&ruid, &euid, &suid) == -1) {
                cerr << "getresuid() failed.\n";
-               exit (EXIT_FAILURE);
        }
-       seteuid (ruid);
+       if (seteuid(ruid) == -1) {
+               cerr << "seteuid() failed.\n";
+       }
 }
 
 PrivilegeEscalator::~PrivilegeEscalator ()
@@ -383,7 +403,10 @@ PrivilegeEscalator::~PrivilegeEscalator ()
 
 PrivilegeEscalator::PrivilegeEscalator ()
 {
-       seteuid (0);
+       int const r = seteuid(0);
+       if (r < 0) {
+               throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+       }
 }
 
 boost::filesystem::path