From 0c71c914faa371ba502a2e1835f763104837cb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 4 Nov 2020 23:46:12 +0200 Subject: [libcxx] Implement the current_path function for windows Differential Revision: https://reviews.llvm.org/D91169 --- libcxx/src/filesystem/operations.cpp | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) (limited to 'libcxx/src/filesystem/operations.cpp') diff --git a/libcxx/src/filesystem/operations.cpp b/libcxx/src/filesystem/operations.cpp index fcb5c2d..429a585 100644 --- a/libcxx/src/filesystem/operations.cpp +++ b/libcxx/src/filesystem/operations.cpp @@ -1022,15 +1022,32 @@ void __create_symlink(path const& from, path const& to, error_code* ec) { path __current_path(error_code* ec) { ErrorHandler err("current_path", ec); +#if defined(_LIBCPP_WIN32API) + // Common extension outside of POSIX getcwd() spec, without needing to + // preallocate a buffer. Also supported by a number of other POSIX libcs. + int size = 0; + path::value_type* ptr = nullptr; + typedef decltype(&::free) Deleter; + Deleter deleter = &::free; +#else auto size = ::pathconf(".", _PC_PATH_MAX); _LIBCPP_ASSERT(size >= 0, "pathconf returned a 0 as max size"); - auto buff = unique_ptr(new char[size + 1]); - char* ret; - if ((ret = ::getcwd(buff.get(), static_cast(size))) == nullptr) + auto buff = unique_ptr(new path::value_type[size + 1]); + path::value_type* ptr = buff.get(); + + // Preallocated buffer, don't free the buffer in the second unique_ptr + // below. + struct Deleter { void operator()(void*) const {} }; + Deleter deleter; +#endif + + unique_ptr hold(detail::getcwd(ptr, size), + deleter); + if (hold.get() == nullptr) return err.report(capture_errno(), "call to getcwd failed"); - return {buff.get()}; + return {hold.get()}; } void __current_path(const path& p, error_code* ec) { -- cgit v1.1