X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fcross_linux.cc;h=c001cbf353fab9129ba9d5b9bf79b0f5d155c196;hb=444809fb888ed99803f2d19c94d3faef067cf348;hp=c8b890bf111f94681d8516f912206ab2f27962fe;hpb=816872f9ddf1251f29fe51594401ddd4f4d89c59;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index c8b890bf1..c001cbf35 100644
--- a/src/lib/cross_linux.cc
+++ b/src/lib/cross_linux.cc
@@ -31,9 +31,8 @@ extern "C" {
 #include <libavformat/avio.h>
 }
 #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>
@@ -57,7 +56,7 @@ using std::vector;
 using std::cerr;
 using std::cout;
 using std::runtime_error;
-using boost::shared_ptr;
+using std::shared_ptr;
 using boost::optional;
 using boost::function;
 
@@ -99,21 +98,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> >
@@ -140,20 +153,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.
@@ -186,10 +220,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) {
@@ -198,18 +233,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 ()
 {
@@ -229,29 +267,6 @@ home_directory ()
 	return getenv("HOME");
 }
 
-string
-command_and_read (string cmd)
-{
-	FILE* pipe = popen (cmd.c_str(), "r");
-	if (!pipe) {
-		throw runtime_error ("popen failed");
-	}
-
-	string result;
-	char buffer[128];
-	try {
-		while (fgets(buffer, sizeof(buffer), pipe)) {
-			result += buffer;
-		}
-	} catch (...) {
-		pclose (pipe);
-		throw;
-	}
-
-	pclose (pipe);
-	return result;
-}
-
 /** @return true if this process is a 32-bit one running on a 64-bit-capable OS */
 bool
 running_32_on_64 ()
@@ -334,7 +349,7 @@ Drive::get ()
 bool
 Drive::unmount ()
 {
-	BOOST_FOREACH (boost::filesystem::path i, _mount_points) {
+	for (auto i: _mount_points) {
 		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) {
@@ -351,19 +366,30 @@ 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";
+	}
 }
 
+
+bool PrivilegeEscalator::test = false;
+
 PrivilegeEscalator::~PrivilegeEscalator ()
 {
-	unprivileged ();
+	if (!test) {
+		unprivileged ();
+	}
 }
 
 PrivilegeEscalator::PrivilegeEscalator ()
 {
-	seteuid (0);
+	if (!test) {
+		int const r = seteuid(0);
+		if (r < 0) {
+			throw PrivilegeError (String::compose("seteuid() call failed with %1", errno));
+		}
+	}
 }
 
 boost::filesystem::path
@@ -382,3 +408,8 @@ disk_write_finished ()
 
 }
 
+string
+dcpomatic::get_process_id ()
+{
+	return dcp::raw_convert<string>(getpid());
+}