GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #75, fix for windows path filtering on namespaces

Browse Source
This commit is contained in:
Steffen Schümann 2020-11-08 11:11:35 +01:00
parent cf7890719f
commit 3fd3482559
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
include/ghc/filesystem.hpp
View File

@ -1257,7 +1257,6 @@ private:
//-------------------------------------------------------------------------------------------------
namespace detail {
// GHC_FS_API void postprocess_path_with_format(path::impl_string_type& p, path::format fmt);
enum utf8_states_t { S_STRT = 0, S_RJCT = 8 };
GHC_FS_API void appendUTF8(std::string& str, uint32_t unicode);
GHC_FS_API bool is_surrogate(uint32_t c);
@ -1654,17 +1653,15 @@ GHC_INLINE void path::postprocess_path_with_format(path::impl_string_type& p, pa
#ifdef GHC_OS_WINDOWS
case path::auto_format:
case path::native_format:
if (p.length() > 4 && p[2] == '?') {
if (detail::startsWith(p, std::string("\\\\?\\"))) {
// remove Windows long filename marker
p.erase(0, 4);
if (detail::startsWith(p, std::string("UNC\\"))) {
p.erase(0, 2);
p[0] = '\\';
if (p.length() >= 4 && p[2] == '?') {
if (p.length() == 4 || (p.length() >= 6 && p[5] == ':')) {
if (detail::startsWith(p, std::string("\\\\?\\"))) {
// remove Windows long filename marker for simple paths
p.erase(0, 4);
}
else if (detail::startsWith(p, std::string("\\??\\"))) {
p.erase(0, 4);
}
}
else if (detail::startsWith(p, std::string("\\??\\"))) {
p.erase(0, 4);
}
}
for (auto& c : p) {
@ -2554,7 +2551,7 @@ GHC_INLINE path::impl_string_type path::native_impl() const
if (is_absolute() && _path.length() > MAX_PATH - 10) {
// expand long Windows filenames with marker
if (has_root_name() && _path[0] == '/') {
result = "\\\\?\\UNC" + _path.substr(1);
result = "\\\\?\\" + _path.substr(1);
}
else {
result = "\\\\?\\" + _path;

7
test/filesystem_test.cpp
View File

@ -1941,6 +1941,11 @@ TEST_CASE("30.10.15.13 exists", "[filesystem][operations][fs.op.exists]")
ec = std::error_code(42, std::system_category());
CHECK(fs::exists(t.path(), ec));
CHECK(!ec);
#if defined(GHC_OS_WINDOWS) && !defined(GHC_FILESYSTEM_FWD)
if (::GetFileAttributesW(L"C:\\fs-test") != INVALID_FILE_ATTRIBUTES) {
CHECK(fs::exists("C:\\fs-test"));
}
#endif
}
TEST_CASE("30.10.15.14 file_size", "[filesystem][operations][fs.op.file_size]")
@ -2729,7 +2734,7 @@ TEST_CASE("Windows: Long filename support", "[filesystem][path][fs.path.win.long
#endif
}
TEST_CASE("Windows: UNC path support", "[filesystem][path][fs.path.win.unc]")
TEST_CASE("Windows: path namespace support", "[filesystem][path][fs.path.win.namespaces]")
{
#ifdef GHC_OS_WINDOWS
std::error_code ec;