Use dcp::file_to_string().

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

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index a3dbdebf2a4b9fb5e3c10a1959d0d2b5985c19c0..65151791cc820dc4f83ab1317e9418a59ac39aa0 100644 (file)
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -26,11 +26,14 @@
 #include "dcpomatic_log.h"
 #include "exceptions.h"
 #include "log.h"
+#include "warnings.h"
 #include <dcp/raw_convert.h>
 #include <glib.h>
+DCPOMATIC_DISABLE_WARNINGS
 extern "C" {
 #include <libavformat/avio.h>
 }
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
@@ -368,7 +371,6 @@ bool
 Drive::unmount ()
 {
        for (auto i: _mount_points) {
-               PrivilegeEscalator esc;
                int const r = umount(i.string().c_str());
                LOG_DISK("Tried to unmount %1 and got %2 and %3", i.string(), r, errno);
                if (r == -1) {
@@ -379,41 +381,6 @@ Drive::unmount ()
 }
 
 
-void
-unprivileged ()
-{
-       uid_t ruid, euid, suid;
-       if (getresuid(&ruid, &euid, &suid) == -1) {
-               cerr << "getresuid() failed.\n";
-       }
-       if (seteuid(ruid) == -1) {
-               cerr << "seteuid() failed.\n";
-       }
-}
-
-
-bool PrivilegeEscalator::test = false;
-
-
-PrivilegeEscalator::~PrivilegeEscalator ()
-{
-       if (!test) {
-               unprivileged ();
-       }
-}
-
-
-PrivilegeEscalator::PrivilegeEscalator ()
-{
-       if (!test) {
-               int const r = seteuid(0);
-               if (r < 0) {
-                       throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
-               }
-       }
-}
-
-
 boost::filesystem::path
 config_path ()
 {