X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=326e590b8b8ce7e2d3840024f06dad240f836d5f;hb=f3e52bd763513190de60e7f6b68c50b34ab80fee;hp=b6241ec1a3f38763b76e19b03aad2df74fac187b;hpb=9276310e6c9be6148ea8b465b44af55413dc0dc0;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index b6241ec1a..326e590b8 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,21 +18,23 @@
 
 */
 
-#include "cross.h"
+
 #include "compose.hpp"
-#include "log.h"
-#include "dcpomatic_log.h"
 #include "config.h"
-#include "exceptions.h"
+#include "cross.h"
+#include "dcpomatic_log.h"
 #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>
-#include <boost/foreach.hpp>
-#include <boost/function.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
 #endif
@@ -47,19 +49,21 @@ extern "C" {
 
 #include "i18n.h"
 
-using std::pair;
-using std::list;
-using std::ifstream;
-using std::string;
-using std::wstring;
-using std::make_pair;
-using std::vector;
+
 using std::cerr;
 using std::cout;
+using std::function;
+using std::ifstream;
+using std::list;
+using std::make_pair;
+using std::pair;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
+using std::string;
+using std::vector;
+using std::wstring;
 using boost::optional;
-using boost::function;
+
 
 /** @param s Number of seconds to sleep for */
 void
@@ -68,12 +72,14 @@ dcpomatic_sleep_seconds (int s)
 	sleep (s);
 }
 
+
 void
 dcpomatic_sleep_milliseconds (int ms)
 {
 	usleep (ms * 1000);
 }
 
+
 /** @return A string of CPU information (model name etc.) */
 string
 cpu_info ()
@@ -98,6 +104,7 @@ cpu_info ()
 	return info;
 }
 
+
 boost::filesystem::path
 resources_path ()
 {
@@ -108,6 +115,9 @@ resources_path ()
 boost::filesystem::path
 xsd_path ()
 {
+	if (auto appdir = getenv("APPDIR")) {
+		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "xsd";
+	}
 	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
 }
 
@@ -115,6 +125,9 @@ xsd_path ()
 boost::filesystem::path
 tags_path ()
 {
+	if (auto appdir = getenv("APPDIR")) {
+		return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "tags";
+	}
 	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags";
 }
 
@@ -130,12 +143,13 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out)
 	}
 }
 
-list<pair<string, string> >
+
+list<pair<string, string>>
 mount_info ()
 {
-	list<pair<string, string> > m;
+	list<pair<string, string>> m;
 
-	FILE* f = setmntent ("/etc/mtab", "r");
+	auto f = setmntent ("/etc/mtab", "r");
 	if (!f) {
 		return m;
 	}
@@ -171,7 +185,7 @@ directory_containing_executable ()
 boost::filesystem::path
 openssl_path ()
 {
-	boost::filesystem::path p = directory_containing_executable() / "dcpomatic2_openssl";
+	auto p = directory_containing_executable() / "dcpomatic2_openssl";
 	if (boost::filesystem::is_regular_file(p)) {
 		return p;
 	}
@@ -196,26 +210,30 @@ disk_writer_path ()
 FILE *
 fopen_boost (boost::filesystem::path p, string t)
 {
-        return fopen (p.c_str(), t.c_str ());
+        return fopen(p.c_str(), t.c_str());
 }
 
+
 int
 dcpomatic_fseek (FILE* stream, int64_t offset, int whence)
 {
 	return fseek (stream, offset, whence);
 }
 
+
 void
 Waker::nudge ()
 {
 
 }
 
+
 Waker::Waker ()
 {
 
 }
 
+
 Waker::~Waker ()
 {
 
@@ -225,7 +243,7 @@ Waker::~Waker ()
 void
 start_tool (string executable)
 {
-	boost::filesystem::path batch = directory_containing_executable() / executable;
+	auto batch = directory_containing_executable() / executable;
 
 	pid_t pid = fork ();
 	if (pid == 0) {
@@ -255,6 +273,7 @@ thread_id ()
 	return (uint64_t) pthread_self ();
 }
 
+
 int
 avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags)
 {
@@ -268,6 +287,7 @@ home_directory ()
 	return getenv("HOME");
 }
 
+
 /** @return true if this process is a 32-bit one running on a 64-bit-capable OS */
 bool
 running_32_on_64 ()
@@ -278,10 +298,10 @@ running_32_on_64 ()
 
 
 static
-vector<pair<string, string> >
+vector<pair<string, string>>
 get_mounts (string prefix)
 {
-	vector<pair<string, string> > mounts;
+	vector<pair<string, string>> mounts;
 
 	std::ifstream f("/proc/mounts");
 	string line;
@@ -306,10 +326,10 @@ Drive::get ()
 	vector<Drive> drives;
 
 	using namespace boost::filesystem;
-	vector<pair<string, string> > mounted_devices = get_mounts("/dev/");
+	auto mounted_devices = get_mounts("/dev/");
 
-	for (directory_iterator i = directory_iterator("/sys/block"); i != directory_iterator(); ++i) {
-		string const name = i->path().filename().string();
+	for (auto i: directory_iterator("/sys/block")) {
+		string const name = i.path().filename().string();
 		path device_type_file("/sys/block/" + name + "/device/type");
 		optional<string> device_type;
 		if (exists(device_type_file)) {
@@ -318,7 +338,7 @@ Drive::get ()
 		}
 		/* Device type 5 is "SCSI_TYPE_ROM" in blkdev.h; seems usually to be a CD/DVD drive */
 		if (!boost::algorithm::starts_with(name, "loop") && (!device_type || *device_type != "5")) {
-			uint64_t const size = dcp::raw_convert<uint64_t>(dcp::file_to_string(*i / "size")) * 512;
+			uint64_t const size = dcp::raw_convert<uint64_t>(dcp::file_to_string(i / "size")) * 512;
 			if (size == 0) {
 				continue;
 			}
@@ -333,9 +353,9 @@ Drive::get ()
 				boost::trim(*model);
 			} catch (...) {}
 			vector<boost::filesystem::path> mount_points;
-			for (vector<pair<string, string> >::const_iterator j = mounted_devices.begin(); j != mounted_devices.end(); ++j) {
-				if (boost::algorithm::starts_with(j->first, "/dev/" + name)) {
-					mount_points.push_back (j->second);
+			for (auto const& j: mounted_devices) {
+				if (boost::algorithm::starts_with(j.first, "/dev/" + name)) {
+					mount_points.push_back (j.second);
 				}
 			}
 			drives.push_back(Drive("/dev/" + name, mount_points, size, vendor, model));
@@ -350,7 +370,8 @@ Drive::get ()
 bool
 Drive::unmount ()
 {
-	BOOST_FOREACH (boost::filesystem::path i, _mount_points) {
+	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) {
@@ -373,19 +394,29 @@ unprivileged ()
 	}
 }
 
+
+bool PrivilegeEscalator::test = false;
+
+
 PrivilegeEscalator::~PrivilegeEscalator ()
 {
-	unprivileged ();
+	if (!test) {
+		unprivileged ();
+	}
 }
 
+
 PrivilegeEscalator::PrivilegeEscalator ()
 {
-	int const r = seteuid(0);
-	if (r < 0) {
-		throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+	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 ()
 {
@@ -402,3 +433,17 @@ disk_write_finished ()
 
 }
 
+
+string
+dcpomatic::get_process_id ()
+{
+	return dcp::raw_convert<string>(getpid());
+}
+
+
+boost::filesystem::path
+fix_long_path (boost::filesystem::path path)
+{
+	return path;
+}
+