diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-06 02:37:16 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-09 23:38:28 +0200 |
| commit | 96f50dd5e600925488fdd9db1580aa01b026269b (patch) | |
| tree | ea8b837a596eb99a7416bfdbfd2d7e4f38603a7b /src/lib/cross_linux.cc | |
| parent | 94a9473993b027b9368077009decbdd4322f90e3 (diff) | |
Use dcp::filesystem to wrap filesystem calls and fix_long_path
anything that is passed to read_file() from libcxml.
This should fix #2623 and other similar problems.
Diffstat (limited to 'src/lib/cross_linux.cc')
| -rw-r--r-- | src/lib/cross_linux.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/cross_linux.cc b/src/lib/cross_linux.cc index 0a12d7cca..015158aa8 100644 --- a/src/lib/cross_linux.cc +++ b/src/lib/cross_linux.cc @@ -26,6 +26,7 @@ #include "dcpomatic_log.h" #include "exceptions.h" #include "log.h" +#include <dcp/filesystem.h> #include <dcp/raw_convert.h> #include <dcp/warnings.h> #include <glib.h> @@ -94,7 +95,7 @@ libdcp_resources_path () if (auto appdir = getenv("APPDIR")) { return boost::filesystem::path(appdir) / "usr" / "share" / "libdcp"; } - return boost::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp"; + return dcp::filesystem::canonical(LINUX_SHARE_PREFIX) / "libdcp"; } @@ -153,7 +154,7 @@ boost::filesystem::path openssl_path () { auto p = directory_containing_executable() / "dcpomatic2_openssl"; - if (boost::filesystem::is_regular_file(p)) { + if (dcp::filesystem::is_regular_file(p)) { return p; } |