X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcross_linux.cc;h=c001cbf353fab9129ba9d5b9bf79b0f5d155c196;hb=a5d004b0773f633401528392fc28e66d70e13ac8;hp=14a7e5b4748c50be8d7c8db8259fd765745aad0e;hpb=350afcbc40fffd8c8780180e153a2ee91088f562;p=dcpomatic.git diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 14a7e5b47..c001cbf35 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -31,8 +31,8 @@ extern "C" { #include } #include -#include -#ifdef DCPOMATIC_DISK +#include +#if BOOST_VERSION >= 106100 #include #endif #include @@ -56,8 +56,9 @@ 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; /** @param s Number of seconds to sleep for */ void @@ -97,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 > @@ -138,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. @@ -184,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) { @@ -196,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 () { @@ -224,30 +264,7 @@ avio_open_boost (AVIOContext** s, boost::filesystem::path file, int flags) boost::filesystem::path 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 getenv("HOME"); } /** @return true if this process is a 32-bit one running on a 64-bit-capable OS */ @@ -258,6 +275,8 @@ running_32_on_64 () return false; } + +static vector > get_mounts (string prefix) { @@ -270,6 +289,7 @@ get_mounts (string prefix) vector 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); } @@ -278,8 +298,9 @@ get_mounts (string prefix) return mounts; } + vector -get_drives () +Drive::get () { vector drives; @@ -300,7 +321,6 @@ get_drives () if (size == 0) { continue; } - bool mounted = false; optional vendor; try { vendor = dcp::file_to_string("/sys/block/" + name + "/device/vendor"); @@ -311,38 +331,65 @@ get_drives () model = dcp::file_to_string("/sys/block/" + name + "/device/model"); boost::trim(*model); } catch (...) {} + vector mount_points; for (vector >::const_iterator j = mounted_devices.begin(); j != mounted_devices.end(); ++j) { if (boost::algorithm::starts_with(j->first, "/dev/" + name)) { - mounted = true; + mount_points.push_back (j->second); } } - drives.push_back(Drive("/dev/" + i->path().filename().string(), size, mounted, vendor, model)); - LOG_DISK("Block device %1 size %2 %3 vendor %4 model %5", name, size, mounted ? "mounted" : "not mounted", vendor.get_value_or("[none]"), model.get_value_or("[none]")); + drives.push_back(Drive("/dev/" + name, mount_points, size, vendor, model)); + LOG_DISK_NC(drives.back().log_summary()); } } return drives; } + +bool +Drive::unmount () +{ + 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) { + return false; + } + } + return true; +} + + void 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 @@ -354,17 +401,15 @@ config_path () return p; } -bool -unmount_drive (string drive) + +void +disk_write_finished () { - vector > mounts = get_mounts (drive); - for (vector >::const_iterator i = mounts.begin(); i != mounts.end(); ++i) { - int const r = umount(i->second.c_str()); - LOG_DISK("Tried to unmount %1 and got %2 and %3", i->second, r, errno); - if (r == -1) { - return false; - } - } - return true; + } +string +dcpomatic::get_process_id () +{ + return dcp::raw_convert(getpid()); +}