[PATCH] D54677: [hurd] Fix unconditional use of PATH_MAX

[Samuel Thibault via Phabricator]

sthibaul created this revision.
sthibaul added reviewers: EricWF, kristina, mclow.lists, lichray.
Herald added subscribers: libcxx-commits, ldionne.

The GNU/Hurd system does not define an arbitrary PATH_MAX limitation, the POSIX 2001 realpath extension can be used instead, and the size of symlinks can be determined.


Repository:
  rCXX libc++

https://reviews.llvm.org/D54677

Files:
  src/filesystem/operations.cpp


Index: src/filesystem/operations.cpp
===================================================================
--- src/filesystem/operations.cpp
+++ src/filesystem/operations.cpp
@@ -530,11 +530,20 @@
   ErrorHandler<path> err("canonical", ec, &orig_p, &cwd);
 
   path p = __do_absolute(orig_p, &cwd, ec);
+#if _POSIX_VERSION >= 200112 || defined(__GLIBC__)
+  char *buff;
+  if ((buff = ::realpath(p.c_str(), NULL)) == nullptr)
+    return err.report(capture_errno());
+  path ret = {buff};
+  free(buff);
+  return ret;
+#else
   char buff[PATH_MAX + 1];
   char* ret;
   if ((ret = ::realpath(p.c_str(), buff)) == nullptr)
     return err.report(capture_errno());
   return {ret};
+#endif
 }
 
 void __copy(const path& from, const path& to, copy_options options,
@@ -1076,16 +1085,27 @@
 path __read_symlink(const path& p, error_code* ec) {
   ErrorHandler<path> err("read_symlink", ec, &p);
 
-  char buff[PATH_MAX + 1];
-  error_code m_ec;
+  struct stat sb;
+  if (lstat(p.c_str(), &sb) == -1) {
+    return err.report(capture_errno());
+  }
+  size_t size = sb.st_size + 1;
+  char *buff = (char*) malloc(size);
+  if (buff == NULL) {
+    return err.report(capture_errno());
+  }
+
   ::ssize_t ret;
-  if ((ret = ::readlink(p.c_str(), buff, PATH_MAX)) == -1) {
+  if ((ret = ::readlink(p.c_str(), buff, size)) == -1) {
+    free(buff);
     return err.report(capture_errno());
   }
-  _LIBCPP_ASSERT(ret <= PATH_MAX, "TODO");
+  _LIBCPP_ASSERT(ret < size, "TODO");
   _LIBCPP_ASSERT(ret > 0, "TODO");
   buff[ret] = 0;
-  return {buff};
+  path res = {buff};
+  free(buff);
+  return res;
 }
 
 bool __remove(const path& p, error_code* ec) {


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D54677.174540.patch
Type: text/x-patch
Size: 1646 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/libcxx-commits/attachments/20181118/3ccb4288/attachment.bin>