commit 5a6ee418394cb4331e0541af9be500f8f40329d4
author Martin Storsjö <martin@martin.st> Wed Nov 04 23:51:12 2020 +0200
committer Copybara-Service <copybara-worker@google.com> Tue Feb 02 13:07:35 2021 -0800
tree 99a2222fffa2970aae4ad96cda3512d4c6887943
parent a8f748d3f9cb8ce0c6b5619125fce9c28f4de551

[libcxx] Implement the canonical function for windows

Differential Revision: https://reviews.llvm.org/D91170

GitOrigin-RevId: 83d705adb2e043e576c9cbaf9709795bc69fe5cf

src/filesystem/operations.cpp

diff --git a/src/filesystem/operations.cpp b/src/filesystem/operations.cpp
index 429a585..fc18de9 100644
--- a/src/filesystem/operations.cpp
+++ b/src/filesystem/operations.cpp
@@ -636,20 +636,20 @@
   ErrorHandler<path> err("canonical", ec, &orig_p, &cwd);
 
   path p = __do_absolute(orig_p, &cwd, ec);
-#if defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112
-  std::unique_ptr<char, decltype(&::free)>
-    hold(::realpath(p.c_str(), nullptr), &::free);
+#if (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112) || defined(_LIBCPP_WIN32API)
+  std::unique_ptr<path::value_type, decltype(&::free)>
+    hold(detail::realpath(p.c_str(), nullptr), &::free);
   if (hold.get() == nullptr)
     return err.report(capture_errno());
   return {hold.get()};
 #else
   #if defined(__MVS__) && !defined(PATH_MAX)
-    char buff[ _XOPEN_PATH_MAX + 1 ];
+    path::value_type buff[ _XOPEN_PATH_MAX + 1 ];
   #else
-    char buff[PATH_MAX + 1];
+    path::value_type buff[PATH_MAX + 1];
   #endif
-  char* ret;
-  if ((ret = ::realpath(p.c_str(), buff)) == nullptr)
+  path::value_type* ret;
+  if ((ret = detail::realpath(p.c_str(), buff)) == nullptr)
     return err.report(capture_errno());
   return {ret};
 #endif