Refs #10260 OpenBSD support #25327

runtime/bin/directory_openbsd.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/globals.h"
-#if defined(TARGET_OS_MACOS)
+#if defined(TARGET_OS_OPENBSD)
 
 #include "bin/directory.h"
 
 #include <dirent.h>  // NOLINT
 #include <errno.h>  // NOLINT
 #include <string.h>  // NOLINT
 #include <sys/param.h>  // NOLINT
 #include <sys/stat.h>  // NOLINT
 #include <unistd.h>  // NOLINT
 
@@ skipping 27 matching lines @@
 
 bool PathBuffer::Add(const char* name) {
   char* data = AsString();
   int written = snprintf(data + length_,
                          PATH_MAX - length_,
                          "%s",
                          name);
   data[PATH_MAX] = '\0';
   if (written <= PATH_MAX - length_ &&
       written >= 0 &&
-      static_cast<size_t>(written) == strlen(name)) {
+      static_cast<size_t>(written) == strnlen(name, PATH_MAX + 1)) {
     length_ += written;
     return true;
   } else {
     errno = ENAMETOOLONG;
     return false;
   }
 }
 
 void PathBuffer::Reset(int new_length) {
   length_ = new_length;
@@ skipping 271 matching lines @@
     ASSERT(errno == ELOOP ||
            errno == ENAMETOOLONG ||
            errno == ENOENT ||
            errno == ENOTDIR);
     return DOES_NOT_EXIST;
   }
 }
 
 
 char* Directory::Current() {
-  return getcwd(NULL, 0);
+  // Android's getcwd adheres closely to the POSIX standard. It won't

[ricow1, 2016/01/05 07:12:13]

Android's?

[mulander, 2016/01/05 16:13:48]

You are correct. getcwd(3) on OpenBSD does allocate the memory and the code will
be replaced with a single return getcwd(NULL, 0) call.

[mulander, 2016/01/05 16:13:48]

Acknowledged.

[mulander, 2016/01/05 16:13:48]

Done.

+  // allocate memory. We need to make our own copy.
+
+  char buffer[PATH_MAX];
+  if (NULL == getcwd(buffer, PATH_MAX)) {
+    return NULL;
+  }
+
+  return strdup(buffer);
 }
 
 
 bool Directory::SetCurrent(const char* path) {
   int result = NO_RETRY_EXPECTED(chdir(path));
   return result == 0;
 }
 
 
 bool Directory::Create(const char* dir_name) {
   // Create the directory with the permissions specified by the
   // process umask.
   int result = NO_RETRY_EXPECTED(mkdir(dir_name, 0777));
   // If the directory already exists, treat it as a success.
   if (result == -1 && errno == EEXIST) {
     return (Exists(dir_name) == EXISTS);
   }
   return (result == 0);
 }
 
-
 char* Directory::SystemTemp() {
   const char* temp_dir = getenv("TMPDIR");
   if (temp_dir == NULL) {
     temp_dir = getenv("TMP");
   }
   if (temp_dir == NULL) {
     temp_dir = "/tmp";
   }
   char* result = strdup(temp_dir);
   // Remove any trailing slash.
   int length = strlen(result);
   if (length > 1 && result[length - 1] == '/') {
     result[length - 1] = '\0';
   }
   return result;
 }
 
-
 char* Directory::CreateTemp(const char* prefix) {
   // Returns a new, unused directory name, adding characters to the end
   // of prefix.  Creates the directory with the permissions specified
   // by the process umask.
   // The return value must be freed by the caller.
   PathBuffer path;
   path.Add(prefix);
   if (!path.Add("XXXXXX")) {
     // Pattern has overflowed.
     return NULL;
@@ skipping 28 matching lines @@
 
 bool Directory::Rename(const char* path, const char* new_path) {
   ExistsResult exists = Exists(path);
   if (exists != EXISTS) return false;
   return (NO_RETRY_EXPECTED(rename(path, new_path)) == 0);
 }
 
 }  // namespace bin
 }  // namespace dart
 
-#endif  // defined(TARGET_OS_MACOS)
+#endif  // defined(TARGET_OS_OPENBSD)