X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=530dda027c854562932ce8492082c9da9e8983b5;hb=e3c78ffdb5e562841e86e6f59a20494159c44de7;hp=d8a33482f6b40d1cbbeb178973c94ddad617a1e5;hpb=6d27b49a7a767a9c8b31dc0f799da940ddb7232f;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index d8a33482f..530dda027 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -32,7 +32,8 @@ extern "C" {
 }
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
-#ifdef DCPOMATIC_DISK
+#include <boost/function.hpp>
+#if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
 #endif
 #include <unistd.h>
@@ -58,6 +59,7 @@ using std::cout;
 using std::runtime_error;
 using boost::shared_ptr;
 using boost::optional;
+using boost::function;
 
 /** @param s Number of seconds to sleep for */
 void
@@ -97,21 +99,36 @@ cpu_info ()
 }
 
 boost::filesystem::path
-shared_path ()
+resources_path ()
 {
 	char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
 	if (p) {
-		return p;
+		return boost::filesystem::path(p) / "dcpomatic2";
+	}
+	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "dcpomatic2";
+}
+
+
+boost::filesystem::path
+xsd_path ()
+{
+	char const * p = getenv ("DCPOMATIC_LINUX_SHARE_PREFIX");
+	if (p) {
+		return boost::filesystem::path(p) / "libdcp" / "xsd";
 	}
-	return boost::filesystem::canonical (LINUX_SHARE_PREFIX);
+	return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "xsd";
 }
 
+
 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> >
@@ -138,20 +155,41 @@ mount_info ()
 	return m;
 }
 
+
+boost::filesystem::path
+directory_containing_executable ()
+{
+#if BOOST_VERSION >= 106100
+	return boost::dll::program_location().parent_path();
+#else
+	char buffer[PATH_MAX];
+	ssize_t N = readlink ("/proc/self/exe", buffer, PATH_MAX);
+	return boost::filesystem::path(string(buffer, N)).parent_path();
+#endif
+}
+
+
 boost::filesystem::path
 openssl_path ()
 {
+	boost::filesystem::path p = directory_containing_executable() / "dcpomatic2_openssl";
+	if (boost::filesystem::is_regular_file(p)) {
+		return p;
+	}
+
 	return "dcpomatic2_openssl";
 }
 
+
 #ifdef DCPOMATIC_DISK
 boost::filesystem::path
 disk_writer_path ()
 {
-	return boost::dll::program_location().parent_path() / "dcpomatic2_disk_writer";
+	return directory_containing_executable() / "dcpomatic2_disk_writer";
 }
 #endif
 
+
 /* Apparently there is no way to create an ofstream using a UTF-8
    filename under Windows.  We are hence reduced to using fopen
    with this wrapper.
@@ -184,10 +222,11 @@ Waker::~Waker ()
 
 }
 
+
 void
-start_tool (boost::filesystem::path dcpomatic, string executable, string)
+start_tool (string executable)
 {
-	boost::filesystem::path batch = dcpomatic.parent_path() / executable;
+	boost::filesystem::path batch = directory_containing_executable() / executable;
 
 	pid_t pid = fork ();
 	if (pid == 0) {
@@ -196,18 +235,21 @@ start_tool (boost::filesystem::path dcpomatic, string executable, string)
 	}
 }
 
+
 void
-start_batch_converter (boost::filesystem::path dcpomatic)
+start_batch_converter ()
 {
-	start_tool (dcpomatic, "dcpomatic2_batch", "DCP-o-matic\\ 2\\ Batch\\ Converter.app");
+	start_tool ("dcpomatic2_batch");
 }
 
+
 void
-start_player (boost::filesystem::path dcpomatic)
+start_player ()
 {
-	start_tool (dcpomatic, "dcpomatic2_player", "DCP-o-matic\\ 2\\ Player.app");
+	start_tool ("dcpomatic2_player");
 }
 
+
 uint64_t
 thread_id ()
 {
@@ -224,7 +266,7 @@ avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags)
 boost::filesystem::path
 home_directory ()
 {
-		return getenv("HOME");
+	return getenv("HOME");
 }
 
 string
@@ -272,6 +314,7 @@ get_mounts (string prefix)
 		vector<string> bits;
 		boost::algorithm::split (bits, line, boost::is_any_of(" "));
 		if (bits.size() > 1 && boost::algorithm::starts_with(bits[0], prefix)) {
+			boost::algorithm::replace_all (bits[1], "\\040", " ");
 			mounts.push_back(make_pair(bits[0], bits[1]));
 			LOG_DISK("Found mounted device %1 from prefix %2", bits[0], prefix);
 		}
@@ -329,7 +372,7 @@ Drive::get ()
 
 
 bool
-Drive::unmount () 
+Drive::unmount ()
 {
 	BOOST_FOREACH (boost::filesystem::path i, _mount_points) {
 		int const r = umount(i.string().c_str());
@@ -348,9 +391,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 ()
@@ -360,7 +404,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
@@ -372,3 +419,10 @@ config_path ()
 	return p;
 }
 
+
+void
+disk_write_finished ()
+{
+
+}
+