X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=ee49d50bc8ef8972da9f13d25b7f90680fc49396;hb=c59981ce92898f6be6987f10ebb29161e36e6766;hp=510bce8c3df4e141ed3c0e8c113c5a8e0a4d7719;hpb=615a8e6967b5b0b59cf191a104569f05a6f0227b;p=dcpomatic.git

diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc
index 510bce8c3..ee49d50bc 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,20 +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/function.hpp>
 #if BOOST_VERSION >= 106100
 #include <boost/dll/runtime_symbol_info.hpp>
 #endif
@@ -46,19 +49,18 @@ extern "C" {
 
 #include "i18n.h"
 
-using std::pair;
-using std::list;
+
+using std::cerr;
+using std::cout;
 using std::ifstream;
-using std::string;
-using std::wstring;
+using std::list;
 using std::make_pair;
+using std::pair;
+using std::string;
 using std::vector;
-using std::cerr;
-using std::cout;
-using std::runtime_error;
-using std::shared_ptr;
+using std::wstring;
 using boost::optional;
-using boost::function;
+
 
 /** @param s Number of seconds to sleep for */
 void
@@ -67,12 +69,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 ()
@@ -97,6 +101,7 @@ cpu_info ()
 	return info;
 }
 
+
 boost::filesystem::path
 resources_path ()
 {
@@ -135,12 +140,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;
 	}
@@ -176,7 +182,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;
 	}
@@ -201,26 +207,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 ()
 {
 
@@ -230,7 +240,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) {
@@ -260,6 +270,7 @@ thread_id ()
 	return (uint64_t) pthread_self ();
 }
 
+
 int
 avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags)
 {
@@ -273,6 +284,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 ()
@@ -283,10 +295,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;
@@ -356,7 +368,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) {
@@ -367,44 +378,15 @@ 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 ()
+config_path (optional<string> version)
 {
 	boost::filesystem::path p;
 	p /= g_get_user_config_dir ();
 	p /= "dcpomatic2";
+	if (version) {
+		p /= *version;
+	}
 	return p;
 }
 
@@ -415,8 +397,36 @@ 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;
+}
+
+
+bool
+show_in_file_manager (boost::filesystem::path dir, boost::filesystem::path)
+{
+	int r = system ("which nautilus");
+	if (WEXITSTATUS(r) == 0) {
+		r = system (String::compose("nautilus \"%1\"", dir.string()).c_str());
+		return static_cast<bool>(WEXITSTATUS(r));
+	} else {
+		int r = system ("which konqueror");
+		if (WEXITSTATUS(r) == 0) {
+			r = system (String::compose("konqueror \"%1\"", dir.string()).c_str());
+			return static_cast<bool>(WEXITSTATUS(r));
+		}
+	}
+
+	return true;
+}
+