X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=919927fdacddd53cf14b7e05c79d9052718b5a76;hp=8ce72d6fce3f38798dab4f10a25bc06d458b2d68;hb=2695f450ca00654cef8709e4e3cfb4cf5de48fc7;hpb=ac1330abe202e31207baa00a3949e446e2c9d3cb diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 8ce72d6fc..919927fda 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2020 Carl Hetherington + Copyright (C) 2012-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,20 +18,18 @@ */ -#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 +#include #include -extern "C" { -#include -} #include -#include #if BOOST_VERSION >= 106100 #include #endif @@ -46,32 +44,17 @@ 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 boost::optional; -using boost::function; - -/** @param s Number of seconds to sleep for */ -void -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 @@ -97,6 +80,7 @@ cpu_info () return info; } + boost::filesystem::path resources_path () { @@ -105,22 +89,12 @@ 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"; -} - - -boost::filesystem::path -tags_path () +libdcp_resources_path () { if (auto appdir = getenv("APPDIR")) { - return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp" / "tags"; + return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp"; } - return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp" / "tags"; + return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp"; } @@ -135,12 +109,13 @@ run_ffprobe (boost::filesystem::path content, boost::filesystem::path out) } } -list > + +list> mount_info () { - list > m; + list> m; - FILE* f = setmntent ("/etc/mtab", "r"); + auto f = setmntent ("/etc/mtab", "r"); if (!f) { return m; } @@ -176,7 +151,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; } @@ -194,33 +169,19 @@ disk_writer_path () #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. -*/ -FILE * -fopen_boost (boost::filesystem::path p, string t) -{ - 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 +191,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) { @@ -254,39 +215,11 @@ start_player () } -uint64_t -thread_id () -{ - return (uint64_t) pthread_self (); -} - -int -avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags) -{ - return avio_open (s, file.c_str(), flags); -} - - -boost::filesystem::path -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 () -{ - /* I'm assuming nobody does this on Linux */ - return false; -} - - static -vector > +vector> get_mounts (string prefix) { - vector > mounts; + vector> mounts; std::ifstream f("/proc/mounts"); string line; @@ -366,44 +299,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 version) { boost::filesystem::path p; p /= g_get_user_config_dir (); p /= "dcpomatic2"; + if (version) { + p /= *version; + } return p; } @@ -414,8 +318,21 @@ disk_write_finished () } -string -dcpomatic::get_process_id () -{ - return dcp::raw_convert(getpid()); +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(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(WEXITSTATUS(r)); + } + } + + return true; } +