diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-10-10 00:40:00 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-10-10 10:58:39 +0200 |
| commit | 6d1582f3c4b5afe57bdc3c34dada275a05a961a4 (patch) | |
| tree | 0b443f98a21ec0c9271e9400506f275211c8a9e9 | |
| parent | d70c44e87632a69a2b8bc90db7ca4b06b7aa611d (diff) | |
Implement weakly_canonical for boost versions without it (e.g. the one on Ubuntu 16.04).
| -rw-r--r-- | src/filesystem.cc | 19 | ||||
| -rw-r--r-- | test/filesystem_test.cc | 15 | ||||
| -rw-r--r-- | wscript | 9 |
3 files changed, 43 insertions, 0 deletions
diff --git a/src/filesystem.cc b/src/filesystem.cc index 0ebe7cf7..428bb029 100644 --- a/src/filesystem.cc +++ b/src/filesystem.cc @@ -144,7 +144,26 @@ dcp::filesystem::canonical(boost::filesystem::path const& path) boost::filesystem::path dcp::filesystem::weakly_canonical(boost::filesystem::path const& path) { +#ifdef DCPOMATIC_HAVE_WEAKLY_CANONICAL return dcp::filesystem::unfix_long_path(boost::filesystem::weakly_canonical(dcp::filesystem::fix_long_path(path))); +#else + boost::filesystem::path complete(boost::filesystem::system_complete(dcp::filesystem::fix_long_path(path))); + boost::filesystem::path result; + for (auto part: complete) { + if (part == "..") { + boost::system::error_code ec; + if (boost::filesystem::is_symlink(result, ec) || result.filename() == "..") { + result /= part; + } else { + result = result.parent_path(); + } + } else if (part != ".") { + result /= part; + } + } + + return dcp::filesystem::unfix_long_path(result.make_preferred()); +#endif } diff --git a/test/filesystem_test.cc b/test/filesystem_test.cc index fc13db99..90b7761e 100644 --- a/test/filesystem_test.cc +++ b/test/filesystem_test.cc @@ -95,3 +95,18 @@ BOOST_AUTO_TEST_CASE (windows_long_filename_test) } #endif + +BOOST_AUTO_TEST_CASE(weakly_canonical_test) +{ +#ifdef LIBDCP_WINDOWS + BOOST_CHECK(dcp::filesystem::weakly_canonical("c:\\a\\b\\c") == boost::filesystem::path("c:\\a\\b\\c")); + BOOST_CHECK(dcp::filesystem::weakly_canonical("c:\\a\\b\\..\\c") == boost::filesystem::path("c:\\a\\c")); + BOOST_CHECK(dcp::filesystem::weakly_canonical("c:\\a\\b\\..\\c\\.\\d") == boost::filesystem::path("c:\\a\\c\\d")); + BOOST_CHECK(dcp::filesystem::weakly_canonical("c:\\a\\..\\b\\..\\c") == boost::filesystem::path("c:\\c")); +#else + BOOST_CHECK(dcp::filesystem::weakly_canonical("/a/b/c") == boost::filesystem::path("/a/b/c")); + BOOST_CHECK(dcp::filesystem::weakly_canonical("/a/b/../c") == boost::filesystem::path("/a/c")); + BOOST_CHECK(dcp::filesystem::weakly_canonical("/a/b/../c/./d") == boost::filesystem::path("/a/c/d")); + BOOST_CHECK(dcp::filesystem::weakly_canonical("/a/../b/../c") == boost::filesystem::path("/c")); +#endif +} @@ -214,6 +214,15 @@ def configure(conf): uselib_store='BOOST_FILESYSTEM') conf.check_cxx(fragment=""" + #include <boost/filesystem.hpp>\n + int main() { boost::filesystem::weakly_canonical("a/b/c"); }\n + """, + mandatory=False, + msg='Checking for boost::filesystem::weakly_canonical', + uselib='BOOST_FILESYSTEM', + define_name='LIBDCP_HAVE_WEAKLY_CANONICAL') + + conf.check_cxx(fragment=""" #include <boost/signals2.hpp>\n int main() { boost::signals2::signal<void (int)> x; }\n """, |